averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-07-20 13:49:10 -07:00
parent cf0f869915 f735f97c64
commit 7b5e5028b7
14 changed files with 533 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/swift-syntax-test/swift-syntax-test.cpp
View File

@@ -143,6 +143,11 @@ IncrementalReuseLog("incremental-reuse-log",
"describes all the nodes reused during "
"incremental parsing."));
static llvm::cl::opt<bool>
OmitNodeIds("omit-node-ids",
llvm::cl::desc("If specified, the serialized syntax tree will not "
"include the IDs of the serialized nodes."));
static llvm::cl::opt<std::string>
OutputFilename("output-filename",
llvm::cl::desc("Path to the output file"));
@@ -685,6 +690,17 @@ int doFullParseRoundTrip(const char *MainExecutablePath,
int doSerializeRawTree(const char *MainExecutablePath,
const StringRef InputFile) {
return parseFile(MainExecutablePath, InputFile, [](SourceFile *SF) -> int {
auto SerializeTree = [](llvm::raw_ostream &os, RC<RawSyntax> Root) {
swift::json::Output::UserInfoMap JsonUserInfo;
if (options::OmitNodeIds) {
JsonUserInfo[swift::json::DontSerializeNodeIdsUserInfoKey] =
(void *)true;
}
swift::json::Output out(os, JsonUserInfo);
out << *Root;
os << "\n";
};
auto Root = SF->getSyntaxRoot().getRaw();
if (!options::OutputFilename.empty()) {
@@ -693,13 +709,9 @@ int doSerializeRawTree(const char *MainExecutablePath,
llvm::sys::fs::F_None);
assert(!errorCode && "Couldn't open output file");
swift::json::Output out(os);
out << *Root;
os << "\n";
SerializeTree(os, Root);
} else {
swift::json::Output out(llvm::outs());
out << *Root;
llvm::outs() << "\n";
SerializeTree(llvm::outs(), Root);
}
return EXIT_SUCCESS;
});