Merge pull request swiftlang#27675 from rintaro/revert-syntaxparse

[SyntaxParse] Revert syntax parsing changes from the master branch
athas · Oct 15, 2019 · f8209f2 · f8209f2
2 parents 3574c51 + 66d19e6
commit f8209f2
Show file tree

Hide file tree

Showing 101 changed files with 3,146 additions and 6,970 deletions.
diff --git a/cmake/modules/SwiftHandleGybSources.cmake b/cmake/modules/SwiftHandleGybSources.cmake
@@ -118,13 +118,10 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AttributeNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AvailabilityNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CommonNodes.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CompletionOnlyNodes.py"
       "${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"

diff --git a/include/swift/AST/DiagnosticsParse.def b/include/swift/AST/DiagnosticsParse.def
@@ -970,8 +970,6 @@ ERROR(expected_expr_throw,PointsToFirstBadToken,
 // Yield Statment
 ERROR(expected_expr_yield,PointsToFirstBadToken,
       "expected expression in 'yield' statement", ())
-ERROR(unexpected_arg_label_yield,none,
-      "unexpected argument label in 'yield' statement", ())
 
 // Defer Statement
 ERROR(expected_lbrace_after_defer,PointsToFirstBadToken,

diff --git a/include/swift/Parse/ASTGen.h b/include/swift/Parse/ASTGen.h
diff --git a/include/swift/Parse/CodeCompletionCallbacks.h b/include/swift/Parse/CodeCompletionCallbacks.h
@@ -40,8 +40,6 @@ class CodeCompletionCallbacks {
   /// completion. This declaration contained the code completion token.
   Decl *ParsedDecl = nullptr;
 
-  TypeLoc ParsedTypeLoc;
-
   /// True if code completion is done inside a raw value expression of an enum
   /// case.
   bool InEnumElementRawValue = false;
@@ -78,10 +76,6 @@ class CodeCompletionCallbacks {
     ParsedDecl = D;
   }
 
-  void setParsedTypeLoc(TypeLoc TyLoc) {
-    ParsedTypeLoc = TyLoc;
-  }
-
   void setLeadingSequenceExprs(ArrayRef<Expr *> exprs) {
     leadingSequenceExprs.assign(exprs.begin(), exprs.end());
   }
@@ -165,10 +159,10 @@ class CodeCompletionCallbacks {
   virtual void completeTypeSimpleBeginning() {};
 
   /// Complete a given type-identifier after we have consumed the dot.
-  virtual void completeTypeIdentifierWithDot() {};
+  virtual void completeTypeIdentifierWithDot(IdentTypeRepr *ITR) {};
 
   /// Complete a given type-identifier when there is no trailing dot.
-  virtual void completeTypeIdentifierWithoutDot() {};
+  virtual void completeTypeIdentifierWithoutDot(IdentTypeRepr *ITR) {};
 
   /// Complete the beginning of a case statement at the top of switch stmt.
   virtual void completeCaseStmtKeyword() {};