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

Add serialization code for RawSyntax

Browse Source 
This patch will allow for serialization of RawSyntax trees to JSON,
which allows external tools to get access to a RawSyntax tree.

This also adds a hook into swift-syntax-test to generate JSON for a
given Swift source file, which will be used in tests in subsequent
commits.
This commit is contained in:
Harlan Haskins
2017-06-15 15:49:51 -07:00
parent d7f4238bda
commit a3aeb4b151
4 changed files with 130 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
#include "swift/Parse/Lexer.h"
#include "swift/Subsystems.h"
#include "swift/Syntax/LegacyASTTransformer.h"
#include "swift/Syntax/Serialization/SyntaxSerialization.h"
#include "swift/Syntax/SyntaxData.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
@@ -39,6 +40,7 @@ enum class ActionType {
DumpTokenSyntax,
FullLexRoundTrip,
FullParseRoundTrip,
SerializeRawTree,
None
};
@@ -58,7 +60,11 @@ Action(llvm::cl::desc("Action (required):"),
clEnumValN(ActionType::FullParseRoundTrip,
"round-trip-parse",
"Parse the source file and print it back out for "
"comparing against the input")));
"comparing against the input"),
clEnumValN(ActionType::SerializeRawTree,
"serialize-raw-tree",
"Parse the source file and serialize the raw tree"
"to JSON")));
static llvm::cl::opt<std::string>
InputSourceFilename("input-source-filename",
@@ -94,53 +100,10 @@ getTokensFromFile(const StringRef InputFilename,
return getTokensFromFile(BufferID, LangOpts, SourceMgr, Diags, Tokens);
}
int doFullLexRoundTrip(const StringRef InputFilename) {
LangOptions LangOpts;
SourceManager SourceMgr;
DiagnosticEngine Diags(SourceMgr);
PrintingDiagnosticConsumer DiagPrinter;
Diags.addConsumer(DiagPrinter);
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
if (getTokensFromFile(InputFilename, LangOpts, SourceMgr,
Diags, Tokens) == EXIT_FAILURE) {
return EXIT_FAILURE;
}
for (auto TokAndPos : Tokens) {
TokAndPos.first->print(llvm::outs());
}
return Diags.hadAnyError() ? EXIT_FAILURE : EXIT_SUCCESS;
}
int doDumpTokenSyntax(const StringRef InputFilename) {
LangOptions LangOpts;
SourceManager SourceMgr;
DiagnosticEngine Diags(SourceMgr);
PrintingDiagnosticConsumer DiagPrinter;
Diags.addConsumer(DiagPrinter);
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
if (getTokensFromFile(InputFilename, LangOpts, SourceMgr,
Diags, Tokens) == EXIT_FAILURE) {
return EXIT_FAILURE;
}
for (auto TokAndPos : Tokens) {
TokAndPos.second.printLineAndColumn(llvm::outs());
llvm::outs() << "\n";
TokAndPos.first->dump(llvm::outs());
llvm::outs() << "\n";
}
return Diags.hadAnyError() ? EXIT_FAILURE : EXIT_SUCCESS;
}
int doFullParseRoundTrip(const StringRef InputFilename) {
int getSyntaxTree(const StringRef InputFilename,
llvm::SmallVectorImpl<syntax::Syntax> &TopLevelDecls,
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> &Tokens) {
CompilerInvocation Invocation;
Invocation.addInputFilename(InputFilename);
Invocation.setModuleName("Test");
@@ -172,8 +135,6 @@ int doFullParseRoundTrip(const StringRef InputFilename) {
assert(SF && "No source file");
// Retokenize the buffer with full fidelity
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
if (getTokensFromFile(BufferID, Invocation.getLangOptions(),
SourceMgr,
Instance.getDiags(), Tokens) == EXIT_FAILURE) {
@@ -192,11 +153,71 @@ int doFullParseRoundTrip(const StringRef InputFilename) {
auto NewNode = transformAST(ASTNode(Decl), Sema, SourceMgr,
BufferID, Tokens);
if (NewNode.hasValue()) {
NewNode.getValue().print(llvm::outs());
auto Symbol = Sema.getNodeForSyntax(NewNode.getValue());
TopLevelDecls.push_back(NewNode.getValue());
}
}
return EXIT_SUCCESS;
}
int doFullLexRoundTrip(const StringRef InputFilename) {
LangOptions LangOpts;
SourceManager SourceMgr;
DiagnosticEngine Diags(SourceMgr);
PrintingDiagnosticConsumer DiagPrinter;
Diags.addConsumer(DiagPrinter);
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
if (getTokensFromFile(InputFilename, LangOpts, SourceMgr,
Diags, Tokens) == EXIT_FAILURE) {
return EXIT_FAILURE;
}
for (auto TokAndPos : Tokens) {
TokAndPos.first->print(llvm::outs());
}
return Diags.hadAnyError() ? EXIT_FAILURE : EXIT_SUCCESS;
}
int doDumpTokenSyntax(const StringRef InputFilename) {
LangOptions LangOpts;
SourceManager SourceMgr;
DiagnosticEngine Diags(SourceMgr);
PrintingDiagnosticConsumer DiagPrinter;
Diags.addConsumer(DiagPrinter);
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
if (getTokensFromFile(InputFilename, LangOpts, SourceMgr,
Diags, Tokens) == EXIT_FAILURE) {
return EXIT_FAILURE;
}
for (auto TokAndPos : Tokens) {
TokAndPos.second.printLineAndColumn(llvm::outs());
llvm::outs() << "\n";
TokAndPos.first->dump(llvm::outs());
llvm::outs() << "\n";
}
return Diags.hadAnyError() ? EXIT_FAILURE : EXIT_SUCCESS;
}
int doFullParseRoundTrip(const StringRef InputFilename) {
llvm::SmallVector<syntax::Syntax, 10> TopLevelDecls;
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
getSyntaxTree(InputFilename, TopLevelDecls, Tokens);
for (auto &Node : TopLevelDecls) {
Node.print(llvm::outs());
}
if (Tokens.back().first->getTokenKind() == tok::eof) {
Tokens.back().first->print(llvm::outs());
}
@@ -204,6 +225,23 @@ int doFullParseRoundTrip(const StringRef InputFilename) {
return EXIT_SUCCESS;
}
int doSerializeRawTree(const StringRef InputFilename) {
llvm::SmallVector<syntax::Syntax, 10> TopLevelDecls;
std::vector<std::pair<RC<syntax::TokenSyntax>,
syntax::AbsolutePosition>> Tokens;
getSyntaxTree(InputFilename, TopLevelDecls, Tokens);
for (auto &Node : TopLevelDecls) {
swift::json::Output out(llvm::outs());
auto Raw = Node.getRaw();
out << Raw;
}
return EXIT_SUCCESS;
}
int main(int argc, char *argv[]) {
llvm::cl::ParseCommandLineOptions(argc, argv, "Swift Syntax Test\n");
@@ -229,6 +267,9 @@ int main(int argc, char *argv[]) {
case ActionType::FullParseRoundTrip:
ExitCode = doFullParseRoundTrip(options::InputSourceFilename);
break;
case ActionType::SerializeRawTree:
ExitCode = doSerializeRawTree(options::InputSourceFilename);
break;
case ActionType::None:
llvm::errs() << "an action is required\n";
llvm::cl::PrintHelpMessage();