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

Revert "libSyntax: create a basic infrastructure for generating libSyntax entities by using Parser."

Browse Source 
This reverts commit ee7a06276d.
It causes build failures like "'swift/Syntax/SyntaxNodes.h' file not found".
This commit is contained in:
Greg Parker
2017-10-19 17:11:48 -07:00
parent d3ebc28c91
commit 48a6b9d464
16 changed files with 39 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,6 @@ enum class ActionType {
FullLexRoundTrip,
FullParseRoundTrip,
SerializeRawTree,
ParserGen,
None
};
@@ -63,10 +62,6 @@ Action(llvm::cl::desc("Action (required):"),
"round-trip-parse",
"Parse the source file and print it back out for "
"comparing against the input"),
clEnumValN(ActionType::ParserGen,
"parse-gen",
"Parse the source file and print it back out for "
"comparing against the input"),
clEnumValN(ActionType::SerializeRawTree,
"serialize-raw-tree",
"Parse the source file and serialize the raw tree"
@@ -77,7 +72,6 @@ InputSourceFilename("input-source-filename",
llvm::cl::desc("Path to the input .swift file"));
} // end namespace options
namespace {
int getTokensFromFile(unsigned BufferID,
LangOptions &LangOpts,
SourceManager &SourceMgr,
@@ -109,27 +103,37 @@ getTokensFromFile(const StringRef InputFilename,
void anchorForGetMainExecutable() {}
SourceFile *getSourceFile(CompilerInstance &Instance,
StringRef InputFileName,
const char *MainExecutablePath) {
int getSyntaxTree(const char *MainExecutablePath,
const StringRef InputFilename,
CompilerInstance &Instance,
llvm::SmallVectorImpl<syntax::Syntax> &TopLevelDecls,
std::vector<std::pair<RC<syntax::RawTokenSyntax>,
syntax::AbsolutePosition>> &Tokens) {
CompilerInvocation Invocation;
Invocation.getLangOptions().KeepTokensInSourceFile = true;
Invocation.addInputFilename(InputFileName);
Invocation.addInputFilename(InputFilename);
Invocation.setMainExecutablePath(
llvm::sys::fs::getMainExecutable(MainExecutablePath,
reinterpret_cast<void *>(&anchorForGetMainExecutable)));
Invocation.setModuleName("Test");
auto &SourceMgr = Instance.getSourceMgr();
PrintingDiagnosticConsumer DiagPrinter;
Instance.addDiagnosticConsumer(&DiagPrinter);
if (Instance.setup(Invocation)) {
return nullptr;
return EXIT_FAILURE;
}
// First, parse the file normally and get the regular old AST.
Instance.performParseOnly();
if (Instance.getDiags().hadAnyError()) {
return EXIT_FAILURE;
}
auto BufferID = Instance.getInputBufferIDs().back();
SourceFile *SF = nullptr;
for (auto Unit : Instance.getMainModule()->getFiles()) {
SF = dyn_cast<SourceFile>(Unit);
@@ -138,21 +142,9 @@ SourceFile *getSourceFile(CompilerInstance &Instance,
}
}
assert(SF && "No source file");
return SF;
}
int getSyntaxTree(const char *MainExecutablePath,
const StringRef InputFilename,
CompilerInstance &Instance,
llvm::SmallVectorImpl<syntax::Syntax> &TopLevelDecls,
std::vector<std::pair<RC<syntax::RawTokenSyntax>,
syntax::AbsolutePosition>> &Tokens) {
auto *SF = getSourceFile(Instance, InputFilename, MainExecutablePath);
auto &SourceMgr = Instance.getSourceMgr();
auto BufferID = Instance.getInputBufferIDs().back();
// Retokenize the buffer with full fidelity
if (getTokensFromFile(BufferID, SF->getASTContext().LangOpts,
if (getTokensFromFile(BufferID, Invocation.getLangOptions(),
SourceMgr,
Instance.getDiags(), Tokens) == EXIT_FAILURE) {
return EXIT_FAILURE;
@@ -268,16 +260,6 @@ int doSerializeRawTree(const char *MainExecutablePath,
return EXIT_SUCCESS;
}
int dumpParserGen(const char *MainExecutablePath,
const StringRef InputFileName) {
CompilerInstance Instance;
SourceFile *SF = getSourceFile(Instance, InputFileName, MainExecutablePath);
SF->getSyntaxRoot().print(llvm::outs());
return 0;
}
}// end of anonymous namespace
int main(int argc, char *argv[]) {
llvm::cl::ParseCommandLineOptions(argc, argv, "Swift Syntax Test\n");
@@ -306,9 +288,6 @@ int main(int argc, char *argv[]) {
case ActionType::SerializeRawTree:
ExitCode = doSerializeRawTree(argv[0], options::InputSourceFilename);
break;
case ActionType::ParserGen:
ExitCode = dumpParserGen(argv[0], options::InputSourceFilename);
break;
case ActionType::None:
llvm::errs() << "an action is required\n";
llvm::cl::PrintHelpMessage();