Remove SyntaxContext and Parser Affordances

Author: CodaFi

include/swift/Parse/Parser.h

@@ -356,22 +356,6 @@ class Parser {
   };
   friend class StructureMarkerRAII;
 
-  /// A RAII object that tells the SyntaxParsingContext to defer Syntax nodes.
-  class DeferringContextRAII {
-    SyntaxParsingContext &Ctx;
-    bool WasDeferring;
-
-  public:
-    explicit DeferringContextRAII(SyntaxParsingContext &SPCtx)
-        : Ctx(SPCtx), WasDeferring(Ctx.shouldDefer()) {
-      Ctx.setShouldDefer();
-    }
-
-    ~DeferringContextRAII() {
-      Ctx.setShouldDefer(WasDeferring);
-    }
-  };
-
   /// The stack of structure markers indicating the locations of
   /// structural elements actively being parsed, including the start
   /// of declarations, statements, and opening operators of various
@@ -380,9 +364,6 @@ class Parser {
   /// This vector is managed by \c StructureMarkerRAII objects.
   llvm::SmallVector<StructureMarker, 16> StructureMarkers;
 
-  /// Current syntax parsing context where call backs should be directed to.
-  SyntaxParsingContext *SyntaxContext;
-
   /// Maps of macro name and version to availability specifications.
   typedef llvm::DenseMap<llvm::VersionTuple,
                          SmallVector<AvailabilitySpec *, 4>>

lib/Parse/CMakeLists.txt

@@ -10,9 +10,6 @@ add_swift_host_library(swiftParse STATIC
   Confusables.cpp
   Lexer.cpp
   ParseDecl.cpp
-  ParsedRawSyntaxNode.cpp
-  ParsedRawSyntaxRecorder.cpp
-  ParsedTrivia.cpp
   ParseExpr.cpp
   ParseGeneric.cpp
   ParseIfConfig.cpp
@@ -23,17 +20,9 @@ add_swift_host_library(swiftParse STATIC
   ParseStmt.cpp
   ParseType.cpp
   ParseVersion.cpp
-  PersistentParserState.cpp
-  SyntaxParsingCache.cpp
-  SyntaxParsingContext.cpp)
-_swift_gyb_target_sources(swiftParse PRIVATE
-    ParsedSyntaxBuilders.cpp.gyb
-    ParsedSyntaxNodes.cpp.gyb
-    ParsedSyntaxRecorder.cpp.gyb)
+  PersistentParserState.cpp)
 target_link_libraries(swiftParse PRIVATE
   swiftAST
-  swiftSyntax
-  swiftSyntaxParse
 )
 
 if (SWIFT_SWIFT_PARSER)
@@ -85,6 +74,4 @@ if (SWIFT_SWIFT_PARSER)
   )
 endif()
 
-add_dependencies(swiftParse swift-parse-syntax-generated-headers)
-
 set_swift_llvm_is_available(swiftParse)

lib/Parse/Lexer.cpp

@@ -40,7 +40,6 @@ void Parser_registerRegexLiteralLexingFn(RegexLiteralLexingFn fn) {
 }
 
 using namespace swift;
-using namespace swift::syntax;
 
 // clang::isAsciiIdentifierStart and clang::isAsciiIdentifierContinue are
 // deliberately not in this list as a reminder that they are using C rules for
@@ -179,12 +178,12 @@ uint32_t swift::validateUTF8CharacterAndAdvance(const char *&Ptr,
 Lexer::Lexer(const PrincipalTag &, const LangOptions &LangOpts,
              const SourceManager &SourceMgr, unsigned BufferID,
              DiagnosticEngine *Diags, LexerMode LexMode,
-             HashbangMode HashbangAllowed, CommentRetentionMode RetainComments,
-             TriviaRetentionMode TriviaRetention)
+             HashbangMode HashbangAllowed,
+             CommentRetentionMode RetainComments)
     : LangOpts(LangOpts), SourceMgr(SourceMgr), BufferID(BufferID),
       LexMode(LexMode),
       IsHashbangAllowed(HashbangAllowed == HashbangMode::Allowed),
-      RetainComments(RetainComments), TriviaRetention(TriviaRetention) {
+      RetainComments(RetainComments) {
   if (Diags)
     DiagQueue.emplace(*Diags, /*emitOnDestruction*/ false);
 }
@@ -227,21 +226,20 @@ void Lexer::initialize(unsigned Offset, unsigned EndOffset) {
 
 Lexer::Lexer(const LangOptions &Options, const SourceManager &SourceMgr,
              unsigned BufferID, DiagnosticEngine *Diags, LexerMode LexMode,
-             HashbangMode HashbangAllowed, CommentRetentionMode RetainComments,
-             TriviaRetentionMode TriviaRetention)
+             HashbangMode HashbangAllowed,
+             CommentRetentionMode RetainComments)
     : Lexer(PrincipalTag(), Options, SourceMgr, BufferID, Diags, LexMode,
-            HashbangAllowed, RetainComments, TriviaRetention) {
+            HashbangAllowed, RetainComments) {
   unsigned EndOffset = SourceMgr.getRangeForBuffer(BufferID).getByteLength();
   initialize(/*Offset=*/0, EndOffset);
 }
 
 Lexer::Lexer(const LangOptions &Options, const SourceManager &SourceMgr,
              unsigned BufferID, DiagnosticEngine *Diags, LexerMode LexMode,
              HashbangMode HashbangAllowed, CommentRetentionMode RetainComments,
-             TriviaRetentionMode TriviaRetention, unsigned Offset,
-             unsigned EndOffset)
+             unsigned Offset, unsigned EndOffset)
     : Lexer(PrincipalTag(), Options, SourceMgr, BufferID, Diags, LexMode,
-            HashbangAllowed, RetainComments, TriviaRetention) {
+            HashbangAllowed, RetainComments) {
   initialize(Offset, EndOffset);
 }
 
@@ -253,7 +251,7 @@ Lexer::Lexer(const Lexer &Parent, State BeginState, State EndState,
             Parent.IsHashbangAllowed
                 ? HashbangMode::Allowed
                 : HashbangMode::Disallowed,
-            Parent.RetainComments, Parent.TriviaRetention) {
+            Parent.RetainComments) {
   assert(BufferID == SourceMgr.findBufferContainingLoc(BeginState.Loc) &&
          "state for the wrong buffer");
   assert(BufferID == SourceMgr.findBufferContainingLoc(EndState.Loc) &&
@@ -277,8 +275,7 @@ Token Lexer::getTokenAt(SourceLoc Loc) {
          "location from the wrong buffer");
 
   Lexer L(LangOpts, SourceMgr, BufferID, getUnderlyingDiags(), LexMode,
-          HashbangMode::Allowed, CommentRetentionMode::None,
-          TriviaRetentionMode::WithoutTrivia);
+          HashbangMode::Allowed, CommentRetentionMode::None);
   L.restoreState(State(Loc));
   return L.peekNextToken();
 }
@@ -301,13 +298,6 @@ void Lexer::formToken(tok Kind, const char *TokStart) {
   }
 
   StringRef TokenText { TokStart, static_cast<size_t>(CurPtr - TokStart) };
-
-  if (TriviaRetention == TriviaRetentionMode::WithTrivia && Kind != tok::eof) {
-    TrailingTrivia = lexTrivia(/*IsForTrailingTrivia=*/true, CurPtr);
-  } else {
-    TrailingTrivia = StringRef();
-  }
-
   NextToken.setToken(Kind, TokenText, CommentLength);
 }
 
@@ -654,12 +644,12 @@ bool Lexer::isOperator(StringRef string) {
 tok Lexer::kindOfIdentifier(StringRef Str, bool InSILMode) {
 #define SIL_KEYWORD(kw)
 #define KEYWORD(kw) if (Str == #kw) return tok::kw_##kw;
-#include "swift/Syntax/TokenKinds.def"
+#include "swift/AST/TokenKinds.def"
 
   // SIL keywords are only active in SIL mode.
   if (InSILMode) {
 #define SIL_KEYWORD(kw) if (Str == #kw) return tok::kw_##kw;
-#include "swift/Syntax/TokenKinds.def"
+#include "swift/AST/TokenKinds.def"
   }
   return tok::identifier;
 }
@@ -696,7 +686,7 @@ void Lexer::lexHash() {
   tok Kind = llvm::StringSwitch<tok>(StringRef(CurPtr, tmpPtr-CurPtr))
 #define POUND_KEYWORD(id) \
   .Case(#id, tok::pound_##id)
-#include "swift/Syntax/TokenKinds.def"
+#include "swift/AST/TokenKinds.def"
   .Default(tok::pound);
 
   // If we didn't find a match, then just return tok::pound.  This is highly
@@ -2615,7 +2605,7 @@ void Lexer::lexImpl() {
     NextToken.setAtStartOfLine(false);
   }
 
-  LeadingTrivia = lexTrivia(/*IsForTrailingTrivia=*/false, LeadingTriviaStart);
+  lexTrivia(/*IsForTrailingTrivia=*/false, LeadingTriviaStart);
 
   // Remember the start of the token so we can form the text range.
   const char *TokStart = CurPtr;
@@ -2955,7 +2945,7 @@ static SourceLoc getLocForStartOfTokenInBuf(SourceManager &SM,
 
   Lexer L(FakeLangOptions, SM, BufferID, nullptr, LexerMode::Swift,
           HashbangMode::Allowed, CommentRetentionMode::None,
-          TriviaRetentionMode::WithoutTrivia, BufferStart, BufferEnd);
+          BufferStart, BufferEnd);
 
   // Lex tokens until we find the token that contains the source location.
   Token Tok;
@@ -3145,138 +3135,6 @@ bool tryAdvanceToEndOfConflictMarker(const char *&CurPtr,
   return false;
 }
 
-ParsedTrivia TriviaLexer::lexTrivia(StringRef TriviaStr) {
-  const char *CurPtr = TriviaStr.begin();
-  const char *BufferEnd = TriviaStr.end();
-
-  ParsedTrivia Pieces;
-
-  while (CurPtr < BufferEnd) {
-    // Iterate through the trivia and lex them into pieces. In the switch
-    // statement in this loop we can
-    //  - 'continue' if we have successfully lexed a trivia piece to continue
-    //    with the next piece. In this case CurPtr points to the next character
-    //    to be lexed (which is not part of the lexed trivia).
-    //  - 'break' to perform the default handling defined towards the bottom of
-    //    the loop.
-
-    const char *TriviaStart = CurPtr;
-
-    switch (*CurPtr++) {
-    case '\n':
-      Pieces.appendOrSquash(TriviaKind::Newline, 1);
-      continue;
-    case '\r':
-      if (CurPtr < BufferEnd && CurPtr[0] == '\n') {
-        Pieces.appendOrSquash(TriviaKind::CarriageReturnLineFeed, 2);
-        ++CurPtr;
-        continue;
-      } else {
-        Pieces.appendOrSquash(TriviaKind::CarriageReturn, 1);
-        continue;
-      }
-    case ' ':
-      Pieces.appendOrSquash(TriviaKind::Space, 1);
-      continue;
-    case '\t':
-      Pieces.appendOrSquash(TriviaKind::Tab, 1);
-      continue;
-    case '\v':
-      Pieces.appendOrSquash(TriviaKind::VerticalTab, 1);
-      continue;
-    case '\f':
-      Pieces.appendOrSquash(TriviaKind::Formfeed, 1);
-      continue;
-    case '/':
-      if (CurPtr < BufferEnd && CurPtr[0] == '/') {
-        // '// ...' comment.
-        bool isDocComment = CurPtr[1] == '/';
-        advanceToEndOfLine(CurPtr, BufferEnd);
-        size_t Length = CurPtr - TriviaStart;
-        Pieces.push_back(isDocComment ? TriviaKind::DocLineComment
-                                      : TriviaKind::LineComment,
-                         Length);
-        continue;
-      } else if (CurPtr < BufferEnd && CurPtr[0] == '*') {
-        // '/* ... */' comment.
-        bool isDocComment = CurPtr[1] == '*';
-        skipToEndOfSlashStarComment(CurPtr, BufferEnd);
-        size_t Length = CurPtr - TriviaStart;
-        Pieces.push_back(isDocComment ? TriviaKind::DocBlockComment
-                                      : TriviaKind::BlockComment,
-                         Length);
-        continue;
-      }
-      break;
-    case '#':
-      if (CurPtr < BufferEnd && CurPtr[0] == '!') {
-        // Hashbang '#!/path/to/swift'.
-        advanceToEndOfLine(CurPtr, BufferEnd);
-        size_t Length = CurPtr - TriviaStart;
-        Pieces.push_back(TriviaKind::Shebang, Length);
-        continue;
-      }
-      break;
-    case '<':
-    case '>':
-      if (tryAdvanceToEndOfConflictMarker(CurPtr, BufferEnd)) {
-        // Conflict marker.
-        size_t Length = CurPtr - TriviaStart;
-        Pieces.push_back(TriviaKind::UnexpectedText, Length);
-        continue;
-      }
-      break;
-    case '\xEF':
-      if ((CurPtr + 1) < BufferEnd && CurPtr[0] == '\xBB' && CurPtr[1] == '\xBF') {
-        // BOM marker.
-        CurPtr = CurPtr + 2;
-        size_t Length = CurPtr - TriviaStart;
-        Pieces.push_back(TriviaKind::UnexpectedText, Length);
-        continue;
-      }
-      break;
-    case 0: {
-      size_t Length = CurPtr - TriviaStart;
-      Pieces.push_back(TriviaKind::UnexpectedText, Length);
-      continue;
-    }
-    default:
-      break;
-    }
-
-    // Default handling for anything that didn't 'continue' in the above switch
-    // statement.
-
-    for (; CurPtr < BufferEnd; ++CurPtr) {
-      bool HasFoundNextTriviaStart = false;
-      switch (*CurPtr) {
-      case '\n':
-      case '\r':
-      case ' ':
-      case '\t':
-      case '\v':
-      case '\f':
-      case '/':
-      case 0:
-        HasFoundNextTriviaStart = true;
-        break;
-      }
-      if (HasFoundNextTriviaStart) {
-        break;
-      }
-    }
-
-    size_t Length = CurPtr - TriviaStart;
-    Pieces.push_back(TriviaKind::UnexpectedText, Length);
-    continue;
-  }
-
-  assert(Pieces.getLength() == TriviaStr.size() &&
-         "Not all characters in the source string have been used in trivia "
-         "pieces");
-  return Pieces;
-}
-
 ArrayRef<Token> swift::
 slice_token_array(ArrayRef<Token> AllTokens, SourceLoc StartLoc,
                   SourceLoc EndLoc) {