Revert "[SyntaxParse] Parse generic parameter clause and generic where clause"

Author: rintaro

cmake/modules/SwiftHandleGybSources.cmake

@@ -121,9 +121,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/NodeSerializationCodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/PatternNodes.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/SILOnlyNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/StmtNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/TypeNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Token.py"

include/swift/Parse/ASTGen.h

@@ -22,24 +22,21 @@
 
 namespace swift {
 /// Generates AST nodes from Syntax nodes.
-class Parser;
 class ASTGen {
   ASTContext &Context;
 
   /// Type cache to prevent multiple transformations of the same syntax node.
   llvm::DenseMap<syntax::SyntaxNodeId, TypeRepr *> TypeCache;
 
-  Parser &P;
+  PersistentParserState **ParserState;
 
   // FIXME: remove when Syntax can represent all types and ASTGen can handle them
   /// Types that cannot be represented by Syntax or generated by ASTGen.
   llvm::DenseMap<SourceLoc, TypeRepr *> Types;
 
-  llvm::DenseMap<SourceLoc, DeclAttributes> ParsedDeclAttrs;
-
 public:
-  ASTGen(ASTContext &Context, Parser &P)
-      : Context(Context), P(P) {}
+  ASTGen(ASTContext &Context, PersistentParserState **ParserState)
+      : Context(Context), ParserState(ParserState) {}
 
   SourceLoc generate(syntax::TokenSyntax Tok, SourceLoc &Loc);
 
@@ -73,15 +70,6 @@ class ASTGen {
   llvm::SmallVector<TypeRepr *, 4>
   generate(syntax::GenericArgumentListSyntax Args, SourceLoc &Loc);
 
-  GenericParamList *
-  generate(syntax::GenericParameterClauseListSyntax clause, SourceLoc &Loc);
-  GenericParamList *
-  generate(syntax::GenericParameterClauseSyntax clause, SourceLoc &Loc);
-  Optional<RequirementRepr>
-  generate(syntax::GenericRequirementSyntax req, SourceLoc &Loc);
-  LayoutConstraint
-  generate(syntax::LayoutConstraintSyntax req, SourceLoc &Loc);
-
   /// Copy a numeric literal value into AST-owned memory, stripping underscores
   /// so the semantic part of the value can be parsed by APInt/APFloat parsers.
   static StringRef copyAndStripUnderscores(StringRef Orig, ASTContext &Context);
@@ -114,8 +102,6 @@ class ASTGen {
 
   ValueDecl *lookupInScope(DeclName Name);
 
-  void addToScope(ValueDecl *D, bool diagnoseRedefinitions = true);
-
   TypeRepr *cacheType(syntax::TypeSyntax Type, TypeRepr *TypeAST);
 
   TypeRepr *lookupType(syntax::TypeSyntax Type);
@@ -126,10 +112,6 @@ class ASTGen {
   bool hasType(const SourceLoc &Loc) const;
 
   TypeRepr *getType(const SourceLoc &Loc) const;
-
-  void addDeclAttributes(DeclAttributes attrs, SourceLoc Loc);
-  bool hasDeclAttributes(SourceLoc Loc) const;
-  DeclAttributes getDeclAttributes(SourceLoc Loc) const;
 };
 } // namespace swift
 

include/swift/Parse/Lexer.h

@@ -200,8 +200,8 @@ class Lexer {
            ParsedTrivia &TrailingTriviaResult) {
     Result = NextToken;
     if (TriviaRetention == TriviaRetentionMode::WithTrivia) {
-      std::swap(LeadingTriviaResult, LeadingTrivia);
-      std::swap(TrailingTriviaResult, TrailingTrivia);
+      LeadingTriviaResult = {LeadingTrivia};
+      TrailingTriviaResult = {TrailingTrivia};
     }
     if (Result.isNot(tok::eof))
       lexImpl();

include/swift/Parse/ParsedSyntaxBuilders.h.gyb

@@ -30,7 +30,7 @@ namespace swift {
 class ParsedRawSyntaxRecorder;
 class SyntaxParsingContext;
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.is_buildable():
 %     child_count = len(node.children)
 class Parsed${node.name}Builder {

include/swift/Parse/ParsedSyntaxNodes.h.gyb

@@ -28,20 +28,20 @@ namespace swift {
 % # Emit the non-collection classes first, then emit the collection classes
 % # that reference these classes.
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if not node.is_syntax_collection():
 class Parsed${node.name};
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.is_syntax_collection():
 using Parsed${node.name} =
   ParsedSyntaxCollection<syntax::SyntaxKind::${node.syntax_kind}>;
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if not node.is_syntax_collection():
 %     qualifier = "" if node.is_base() else "final"
 %     for line in dedented_lines(node.description):

include/swift/Parse/ParsedSyntaxRecorder.h.gyb

@@ -31,7 +31,7 @@ class SyntaxParsingContext;
 
 struct ParsedSyntaxRecorder {
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.children:
 %     child_params = []
 %     for child in node.children:

include/swift/Parse/Parser.h

@@ -695,19 +695,11 @@ class Parser {
   /// plain Tok.is(T1) check).
   bool skipUntilTokenOrEndOfLine(tok T1);
 
-  //-------------------------------------------------------------------------//
-  // Ignore token APIs.
-  // This is used when we skip gabage text in the source text. 
-
-  /// Ignore the current single token.
   void ignoreToken();
   void ignoreToken(tok Kind) {
-  /// Ignore the current single token asserting its kind.
     assert(Tok.is(Kind));
     ignoreToken();
   }
-  /// Conditionally ignore the current single token if it matches with the \p
-  /// Kind.
   bool ignoreIf(tok Kind) {
     if (!Tok.is(Kind))
       return false;
@@ -1181,8 +1173,7 @@ class Parser {
   using TypeASTResult = ParserResult<TypeRepr>;
   using TypeResult = ParsedSyntaxResult<ParsedTypeSyntax>;
 
-  ParsedSyntaxResult<ParsedLayoutConstraintSyntax>
-  parseLayoutConstraintSyntax();
+  LayoutConstraint parseLayoutConstraint(Identifier LayoutConstraintID);
 
   TypeResult parseTypeSyntax();
   TypeResult parseTypeSyntax(Diag<> MessageID, bool HandleCodeCompletion = true,
@@ -1606,19 +1597,8 @@ class Parser {
   //===--------------------------------------------------------------------===//
   // Generics Parsing
 
-  ParserResult<GenericParamList> parseSILGenericParams();
-
-  ParserStatus parseSILGenericParamsSyntax(
-      Optional<ParsedGenericParameterClauseListSyntax> &result);
-
-  ParsedSyntaxResult<ParsedGenericParameterClauseSyntax>
-  parseGenericParameterClauseSyntax();
-
-  ParsedSyntaxResult<ParsedGenericWhereClauseSyntax>
-  parseGenericWhereClauseSyntax(bool &FirstTypeInComplete,
-                                bool AllowLayoutConstraints = false);
-
   ParserResult<GenericParamList> parseGenericParameters();
+  ParserResult<GenericParamList> parseGenericParameters(SourceLoc LAngleLoc);
   ParserStatus parseGenericParametersBeforeWhere(SourceLoc LAngleLoc,
                         SmallVectorImpl<GenericTypeParamDecl *> &GenericParams);
   ParserResult<GenericParamList> maybeParseGenericParams();

include/swift/Syntax/SyntaxBuilders.h.gyb

@@ -29,7 +29,7 @@ namespace syntax {
 
 class SyntaxArena;
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.is_buildable():
 %     child_count = len(node.children)
 class ${node.name}Builder {

include/swift/Syntax/SyntaxFactory.h.gyb

@@ -71,7 +71,7 @@ struct SyntaxFactory {
   static Syntax
   makeBlankCollectionSyntax(SyntaxKind Kind);
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.children:
 %     child_params = []
 %     for child in node.children:

include/swift/Syntax/SyntaxKind.h.gyb

@@ -2,7 +2,7 @@
   from gyb_syntax_support import *
   from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS
   grouped_nodes = { kind: [] for kind in SYNTAX_BASE_KINDS }
-  for node in SYNTAX_NODES + SILONLY_NODES:
+  for node in SYNTAX_NODES:
     grouped_nodes[node.base_kind].append(node)
   # -*- mode: C++ -*-
   # Ignore the following admonition; it applies to the resulting .h file only
@@ -89,14 +89,12 @@ struct WrapperTypeTraits<syntax::SyntaxKind> {
       return 0;
     case syntax::SyntaxKind::Unknown:
       return 1;
-% for node in SYNTAX_NODES:
+% for name, nodes in grouped_nodes.items():
+%   for node in nodes:
     case syntax::SyntaxKind::${node.syntax_kind}: 
       return ${SYNTAX_NODE_SERIALIZATION_CODES[node.syntax_kind]};
+%   end
 % end
-% for node in SILONLY_NODES:
-    case syntax::SyntaxKind::${node.syntax_kind}:
-% end
-      llvm_unreachable("unserializable syntax kind");
     }
     llvm_unreachable("unhandled kind");
   }
@@ -124,10 +122,6 @@ struct ScalarReferenceTraits<syntax::SyntaxKind> {
       case syntax::SyntaxKind::${node.syntax_kind}:
         return "\"${node.syntax_kind}\"";
 % end
-% for node in SILONLY_NODES:
-      case syntax::SyntaxKind::${node.syntax_kind}:
-% end
-        llvm_unreachable("unserializable syntax kind");
     }
     llvm_unreachable("unhandled kind");
   }

include/swift/Syntax/SyntaxNodes.h.gyb

@@ -32,21 +32,21 @@ namespace syntax {
 % # Emit the non-collection classes first, then emit the collection classes
 % # that reference these classes.
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if not node.is_syntax_collection():
 class ${node.name};
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if node.is_syntax_collection():
 using ${node.name} =
   SyntaxCollection<SyntaxKind::${node.syntax_kind},
                    ${node.collection_element_type}>;
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if not node.is_syntax_collection():
 %     qualifier = "" if node.is_base() else "final"
 %     for line in dedented_lines(node.description):

include/swift/Syntax/SyntaxVisitor.h.gyb

@@ -32,7 +32,7 @@ namespace syntax {
 struct SyntaxVisitor {
   virtual ~SyntaxVisitor() {}
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES:
 %   if is_visitable(node):
   virtual void visit(${node.name} node);
 %   end