Merge pull request #26034 from apple/revert-25193-gsoc-2019-parser

Revert "[Parser] Decouple the parser from AST creation (part 1)"

Author: beccadax

include/swift/Parse/ASTGen.h

@@ -156,19 +156,6 @@ class ParsedRawSyntaxNode {
 
   // Deferred Token Data =====================================================//
 
-  CharSourceRange getDeferredTokenRangeWithTrivia() const {
-    assert(DK == DataKind::DeferredToken);
-    auto leadTriviaPieces = getDeferredLeadingTriviaPieces();
-    auto trailTriviaPieces = getDeferredTrailingTriviaPieces();
-
-    auto leadTriviaLen = ParsedTriviaPiece::getTotalLength(leadTriviaPieces);
-    auto trailTriviaLen = ParsedTriviaPiece::getTotalLength(trailTriviaPieces);
-
-    SourceLoc begin = DeferredToken.TokLoc.getAdvancedLoc(-leadTriviaLen);
-    unsigned len = leadTriviaLen + DeferredToken.TokLength + trailTriviaLen;
-
-    return CharSourceRange{begin, len};
-  }
   CharSourceRange getDeferredTokenRangeWithoutBackticks() const {
     assert(DK == DataKind::DeferredToken);
     return CharSourceRange{DeferredToken.TokLoc, DeferredToken.TokLength};

include/swift/Parse/HiddenLibSyntaxAction.h

@@ -66,31 +66,11 @@ public:
 
   static Parsed${node.name} makeBlank${node.syntax_kind}(SourceLoc loc,
       SyntaxParsingContext &SPCtx);
-%   elif node.is_unknown():
-private:
-  static Parsed${node.name} record${node.syntax_kind}(
-      ArrayRef<ParsedSyntax> elts,
-      ParsedRawSyntaxRecorder &rec);
-
-public:
-  static Parsed${node.name} defer${node.syntax_kind}(
-      ArrayRef<ParsedSyntax> elts,
-      SyntaxParsingContext &SPCtx);
-
-  static Parsed${node.name} make${node.syntax_kind}(
-      ArrayRef<ParsedSyntax> elts,
-      SyntaxParsingContext &SPCtx);
 %   end
 % end
 
 #pragma mark - Convenience APIs
 
-public:
-  static ParsedTokenSyntax makeToken(const Token &Tok,
-                                     const ParsedTrivia &LeadingTrivia,
-                                     const ParsedTrivia &TrailingTrivia,
-                                     SyntaxParsingContext &SPCtx);
-
   /// Records an unlabelled TupleTypeElementSyntax with the provided type and
   /// optional trailing comma.
   static ParsedTupleTypeElementSyntax

include/swift/Parse/LibSyntaxGenerator.h

@@ -25,12 +25,10 @@
 #include "swift/AST/Pattern.h"
 #include "swift/AST/Stmt.h"
 #include "swift/Basic/OptionSet.h"
-#include "swift/Parse/ASTGen.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Parse/LocalContext.h"
 #include "swift/Parse/PersistentParserState.h"
 #include "swift/Parse/Token.h"
-#include "swift/Parse/ParsedSyntaxNodes.h"
 #include "swift/Parse/ParserPosition.h"
 #include "swift/Parse/ParserResult.h"
 #include "swift/Parse/SyntaxParserResult.h"
@@ -378,9 +376,6 @@ class Parser {
   /// Current syntax parsing context where call backs should be directed to.
   SyntaxParsingContext *SyntaxContext;
 
-  /// The AST generator.
-  ASTGen Generator;
-
 public:
   Parser(unsigned BufferID, SourceFile &SF, DiagnosticEngine* LexerDiags,
          SILParserTUStateBase *SIL,
@@ -523,12 +518,6 @@ class Parser {
     assert(Tok.is(K) && "Consuming wrong token kind");
     return consumeToken();
   }
-  /// Consume a token without providing it to the SyntaxParsingContext.
-  ParsedTokenSyntax consumeTokenSyntax();
-  ParsedTokenSyntax consumeTokenSyntax(tok K) {
-    assert(Tok.is(K) && "Consuming wrong token kind");
-    return consumeTokenSyntax();
-  }
 
   SourceLoc consumeIdentifier(Identifier *Result = nullptr,
                               bool allowDollarIdentifier = false) {
@@ -1335,15 +1324,6 @@ class Parser {
   ParserResult<Expr> parseExprSuper();
   ParserResult<Expr> parseExprStringLiteral();
 
-  // todo [gsoc]: create new result type for ParsedSyntax
-  // todo [gsoc]: turn into proper non-templated methods later
-  template <typename SyntaxNode>
-  ParsedExprSyntax parseExprSyntax();
-
-  // todo [gsoc]: remove when possible
-  template <typename SyntaxNode>
-  ParserResult<Expr> parseExprAST();
-
   StringRef copyAndStripUnderscores(StringRef text);
 
   ParserStatus parseStringSegments(SmallVectorImpl<Lexer::StringSegment> &Segments,

include/swift/Parse/ParsedRawSyntaxNode.h

@@ -33,12 +33,6 @@ namespace syntax {
 
 typedef void *OpaqueSyntaxNode;
 
-// todo [gsoc]: remove when possible
-enum class OpaqueSyntaxNodeKind {
-  SwiftSyntax,
-  LibSyntax,
-};
-
 class SyntaxParseActions {
   virtual void _anchor();
 
@@ -66,9 +60,6 @@ class SyntaxParseActions {
   lookupNode(size_t lexerOffset, syntax::SyntaxKind kind) {
     return std::make_pair(0, nullptr);
   }
-
-  /// Returns what kind of OpaqueSyntaxNode is created by `recordXXX` methods.
-  virtual OpaqueSyntaxNodeKind getOpaqueKind() = 0;
 };
 
 } // end namespace swift