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

[ASTGen] Support macro expanded buffer

Browse Source 
* Make ExportedSourceFile hold any Syntax as the root node
* Move `ExportedSourceFileRequest::evaluate()` to `ParseRequests.cpp`
* Pass  the decl context and `GeneatedSourceFileInfo::Kind` to
  `swift_ASTGen_parseSourceFile()` to customize the parsing
* Make `ExportedSourceFile` to hold an arbitrary Syntax node
* Move round-trip checking into `ExportedSourceFileRequest::evaluate()`
* Split `parseSourceFileViaASTGen` completely from C++ parsing logic
  (in `ParseSourceFileRequest::evaluate()`)
* Remove 'ParserDiagnostics' experimental feature: Now that we have
  ParserASTGen mode which includes the swift-syntax parser diagnostics.
This commit is contained in:
Rintaro Ishizaki
2024-10-28 16:45:15 -07:00
parent 919ec930f9
commit e566a746c8
21 changed files with 408 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/DriverTool/swift_parse_test_main.cpp
View File

@@ -18,7 +18,6 @@
#include "swift/Basic/LLVM.h"
#include "swift/Basic/LangOptions.h"
#include "swift/Bridging/ASTGen.h"
#include "swift/Parse/Parser.h"
#include "swift/Subsystems.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Error.h"
@@ -86,6 +85,9 @@ struct LibParseExecutor {
std::unique_ptr<ASTContext> ctx(ASTContext::get(
langOpts, typeckOpts, silOpts, searchPathOpts, clangOpts, symbolOpts,
casOpts, serializationOpts, SM, diagEngine));
auto &eval = ctx->evaluator;
registerParseRequestFunctions(eval);
registerTypeCheckerRequestFunctions(eval);
SourceFile::ParsingOptions parseOpts;
parseOpts |= SourceFile::ParsingFlags::DisablePoundIfEvaluation;
@@ -96,13 +98,9 @@ struct LibParseExecutor {
SourceFile *SF =
new (*ctx) SourceFile(*M, SourceFileKind::Library, bufferID, parseOpts);
Parser parser(bufferID, *SF, /*SILParserState=*/nullptr);
SmallVector<ASTNode> items;
parser.parseTopLevelItems(items);
auto items = evaluateOrDefault(eval, ParseSourceFileRequest{SF}, {}).TopLevelItems;
if (opts.contains(ExecuteOptionFlag::Dump)) {
registerParseRequestFunctions(ctx->evaluator);
registerTypeCheckerRequestFunctions(ctx->evaluator);
for (auto &item : items) {
item.dump(llvm::outs());
}
@@ -120,8 +118,9 @@ struct SwiftParserExecutor {
#if SWIFT_BUILD_SWIFT_SYNTAX
// TODO: Implement 'ExecuteOptionFlag::SkipBodies'
auto sourceFile = swift_ASTGen_parseSourceFile(
buffer.getBufferStart(), buffer.getBufferSize(), /*moduleName=*/"",
buffer.getBufferIdentifier().data(), /*ASTContext=*/nullptr);
buffer.getBuffer(),
/*moduleName=*/StringRef(), buffer.getBufferIdentifier(),
/*declContextPtr=*/nullptr, BridgedGeneratedSourceFileKindNone);
swift_ASTGen_destroySourceFile(sourceFile);
if (opts.contains(ExecuteOptionFlag::Dump)) {
@@ -162,8 +161,9 @@ struct ASTGenExecutor {
std::unique_ptr<ASTContext> ctx(ASTContext::get(
langOpts, typeckOpts, silOpts, searchPathOpts, clangOpts, symbolOpts,
casOpts, serializationOpts, SM, diagEngine));
registerParseRequestFunctions(ctx->evaluator);
registerTypeCheckerRequestFunctions(ctx->evaluator);
auto &eval = ctx->evaluator;
registerParseRequestFunctions(eval);
registerTypeCheckerRequestFunctions(eval);
SourceFile::ParsingOptions parseOpts;
parseOpts |= SourceFile::ParsingFlags::DisablePoundIfEvaluation;
@@ -174,9 +174,7 @@ struct ASTGenExecutor {
SourceFile *SF =
new (*ctx) SourceFile(*M, SourceFileKind::Library, bufferID, parseOpts);
Parser P(bufferID, *SF, nullptr);
SmallVector<ASTNode> items;
P.parseTopLevelItems(items);
auto items = evaluateOrDefault(eval, ParseSourceFileRequest{SF}, {}).TopLevelItems;
if (opts.contains(ExecuteOptionFlag::Dump)) {
for (auto &item : items) {