---

yaml
---
r: 348650
b: refs/heads/master
c: 97febd4
h: refs/heads/master

Author: beccadax

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1ff1845330dcfc289bf6a77c12a79f29e302d12f
+refs/heads/master: 97febd42a9190367941d4e28884c1b0a9fa8ed59
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/cmake/modules/SwiftHandleGybSources.cmake

@@ -118,6 +118,7 @@ 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"

trunk/include/swift/AST/ASTTypeIDZone.def

@@ -14,25 +14,27 @@
 //  for use with the TypeID template.
 //
 //===----------------------------------------------------------------------===//
-SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
-SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
-SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
-SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
-SWIFT_TYPEID_NAMED(Decl *, Decl)
-SWIFT_TYPEID_NAMED(ModuleDecl *, ModuleDecl)
-SWIFT_TYPEID(Type)
-SWIFT_TYPEID(TypePair)
+
+SWIFT_TYPEID(AncestryFlags)
+SWIFT_TYPEID(CtorInitializerKind)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
 SWIFT_TYPEID(PropertyWrapperTypeInfo)
-SWIFT_TYPEID(CtorInitializerKind)
+SWIFT_TYPEID(Requirement)
 SWIFT_TYPEID(ResilienceExpansion)
-SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>, PropertyWrapperMutability)
+SWIFT_TYPEID(Type)
+SWIFT_TYPEID(TypePair)
 SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
-SWIFT_TYPEID_NAMED(OperatorDecl *, OperatorDecl)
-SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)
-SWIFT_TYPEID(AncestryFlags)
+SWIFT_TYPEID_NAMED(Decl *, Decl)
+SWIFT_TYPEID_NAMED(GenericParamList *, GenericParamList)
 SWIFT_TYPEID_NAMED(GenericSignature *, GenericSignature)
 SWIFT_TYPEID_NAMED(GenericTypeParamType *, GenericTypeParamType)
-SWIFT_TYPEID(Requirement)
 SWIFT_TYPEID_NAMED(IterableDeclContext *, IterableDeclContext)
-SWIFT_TYPEID_NAMED(GenericParamList *, GenericParamList)
+SWIFT_TYPEID_NAMED(ModuleDecl *, ModuleDecl)
+SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
+SWIFT_TYPEID_NAMED(OperatorDecl *, OperatorDecl)
+SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>,
+                   PropertyWrapperMutability)
+SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
+SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)
+SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
+SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)

trunk/include/swift/AST/TypeCheckRequests.h

@@ -1094,7 +1094,7 @@ class InferredGenericSignatureRequest :
     public SimpleRequest<InferredGenericSignatureRequest,
                          GenericSignature *(ModuleDecl *,
                                             GenericSignature *,
-                                            SmallVector<GenericParamList *, 2>,
+                                            GenericParamList *,
                                             SmallVector<Requirement, 2>,
                                             SmallVector<TypeLoc, 2>,
                                             bool),
@@ -1110,7 +1110,7 @@ class InferredGenericSignatureRequest :
   evaluate(Evaluator &evaluator,
            ModuleDecl *module,
            GenericSignature *baseSignature,
-           SmallVector<GenericParamList *, 2> addedParameters,
+           GenericParamList *gpl,
            SmallVector<Requirement, 2> addedRequirements,
            SmallVector<TypeLoc, 2> inferenceSources,
            bool allowConcreteGenericParams) const;

trunk/include/swift/AST/TypeCheckerTypeIDZone.def

@@ -54,7 +54,7 @@ SWIFT_REQUEST(NameLookup, GenericSignatureRequest,
               SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, InferredGenericSignatureRequest,
               GenericSignature *(ModuleDecl *, GenericSignature *,
-                                 SmallVector<GenericParamList *, 2>,
+                                 GenericParamList *,
                                  SmallVector<Requirement, 2>,
                                  SmallVector<TypeLoc, 2>, bool),
               Cached, NoLocationInfo)

trunk/include/swift/Option/FrontendOptions.td

@@ -86,6 +86,10 @@ def tbd_compatibility_version
 def tbd_compatibility_version_EQ : Joined<["-"], "tbd-compatibility-version=">,
   Alias<tbd_compatibility_version>;
 
+def tbd_is_installapi: Flag<["-"], "tbd-is-installapi">,
+  HelpText<"If the TBD file should indicate it's being generated during "
+           "InstallAPI">;
+
 def verify : Flag<["-"], "verify">,
   HelpText<"Verify diagnostics against expected-{error|warning|note} "
            "annotations">;

trunk/include/swift/Parse/ASTGen.h

@@ -16,6 +16,7 @@
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
+#include "swift/AST/TypeRepr.h"
 #include "swift/Parse/PersistentParserState.h"
 #include "swift/Syntax/SyntaxNodes.h"
 #include "llvm/ADT/DenseMap.h"
@@ -43,6 +44,30 @@ class ASTGen {
 
   SourceLoc generate(const syntax::TokenSyntax &Tok, const SourceLoc Loc);
 
+  SourceLoc generateIdentifierDeclName(const syntax::TokenSyntax &Tok,
+                                       const SourceLoc, Identifier &Identifier);
+
+public:
+  //===--------------------------------------------------------------------===//
+  // Decls.
+
+  Decl *generate(const syntax::DeclSyntax &Decl, const SourceLoc Loc);
+  TypeDecl *generate(const syntax::AssociatedtypeDeclSyntax &Decl,
+                     const SourceLoc Loc);
+
+  TrailingWhereClause *generate(const syntax::GenericWhereClauseSyntax &syntax,
+                                const SourceLoc Loc);
+  MutableArrayRef<TypeLoc>
+  generate(const syntax::TypeInheritanceClauseSyntax &syntax,
+           const SourceLoc Loc, bool allowClassRequirement);
+
+private:
+  DeclAttributes
+  generateDeclAttributes(const syntax::DeclSyntax &D,
+                         const Optional<syntax::AttributeListSyntax> &attrs,
+                         const Optional<syntax::ModifierListSyntax> &modifiers,
+                         SourceLoc Loc, bool includeComments);
+
 public:
   //===--------------------------------------------------------------------===//
   // Expressions.
@@ -97,6 +122,10 @@ class ASTGen {
                      const SourceLoc Loc);
   TypeRepr *generate(const syntax::ImplicitlyUnwrappedOptionalTypeSyntax &Type,
                      const SourceLoc Loc);
+  TypeRepr *generate(const syntax::ClassRestrictionTypeSyntax &Type,
+                     const SourceLoc Loc);
+  TypeRepr *generate(const syntax::CodeCompletionTypeSyntax &Type,
+                     const SourceLoc Loc);
   TypeRepr *generate(const syntax::UnknownTypeSyntax &Type,
                      const SourceLoc Loc);
 

trunk/include/swift/Parse/CodeCompletionCallbacks.h

@@ -40,6 +40,8 @@ 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;
@@ -76,6 +78,10 @@ class CodeCompletionCallbacks {
     ParsedDecl = D;
   }
 
+  void setParsedTypeLoc(TypeLoc TyLoc) {
+    ParsedTypeLoc = TyLoc;
+  }
+
   void setLeadingSequenceExprs(ArrayRef<Expr *> exprs) {
     leadingSequenceExprs.assign(exprs.begin(), exprs.end());
   }
@@ -159,10 +165,10 @@ class CodeCompletionCallbacks {
   virtual void completeTypeSimpleBeginning() {};
 
   /// Complete a given type-identifier after we have consumed the dot.
-  virtual void completeTypeIdentifierWithDot(IdentTypeRepr *ITR) {};
+  virtual void completeTypeIdentifierWithDot() {};
 
   /// Complete a given type-identifier when there is no trailing dot.
-  virtual void completeTypeIdentifierWithoutDot(IdentTypeRepr *ITR) {};
+  virtual void completeTypeIdentifierWithoutDot() {};
 
   /// Complete the beginning of a case statement at the top of switch stmt.
   virtual void completeCaseStmtKeyword() {};

trunk/include/swift/Parse/LibSyntaxGenerator.h

@@ -38,7 +38,7 @@ class LibSyntaxGenerator {
     assert(Node.isDeferredToken());
 
     auto Kind = Node.getTokenKind();
-    auto Range = Node.getDeferredTokenRangeWithTrivia();
+    auto Range = Node.getDeferredTokenRange();
     auto LeadingTriviaPieces = Node.getDeferredLeadingTriviaPieces();
     auto TrailingTriviaPieces = Node.getDeferredTrailingTriviaPieces();
 

trunk/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 + PARSEONLY_NODES:
 %   if node.is_buildable():
 %     child_count = len(node.children)
 class Parsed${node.name}Builder {

trunk/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 + PARSEONLY_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 + PARSEONLY_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 + PARSEONLY_NODES:
 %   if not node.is_syntax_collection():
 %     qualifier = "" if node.is_base() else "final"
 %     for line in dedented_lines(node.description):

trunk/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 + PARSEONLY_NODES:
 %   if node.children:
 %     child_params = []
 %     for child in node.children:

trunk/include/swift/Parse/Parser.h

@@ -1004,12 +1004,23 @@ class Parser {
   bool delayParsingDeclList(SourceLoc LBLoc, SourceLoc &RBLoc,
                             IterableDeclContext *IDC);
 
+  ParsedSyntaxResult<ParsedTypeInheritanceClauseSyntax>
+  parseTypeInheritanceClauseSyntax(bool allowClassRequirement,
+                                   bool allowAnyObject);
+
+  ParsedSyntaxResult<ParsedDeclSyntax>
+  parseDeclAssociatedTypeSyntax(ParseDeclOptions flags,
+                                Optional<ParsedAttributeListSyntax> attrs,
+                                Optional<ParsedModifierListSyntax> modifiers);
+
   ParserResult<TypeDecl> parseDeclTypeAlias(ParseDeclOptions Flags,
-                                            DeclAttributes &Attributes);
+                                            DeclAttributes &Attributes,
+                                            SourceLoc leadingLoc);
 
   ParserResult<TypeDecl> parseDeclAssociatedType(ParseDeclOptions Flags,
-                                                 DeclAttributes &Attributes);
-  
+                                                 DeclAttributes &Attributes,
+                                                 SourceLoc leadingLoc);
+
   /// Parse a #if ... #endif directive.
   /// Delegate callback function to parse elements in the blocks.
   ParserResult<IfConfigDecl> parseIfConfig(
@@ -1091,7 +1102,7 @@ class Parser {
 
   ParserResult<ImportDecl> parseDeclImport(ParseDeclOptions Flags,
                                            DeclAttributes &Attributes);
-  ParserStatus parseInheritance(SmallVectorImpl<TypeLoc> &Inherited,
+  ParserStatus parseInheritance(MutableArrayRef<TypeLoc> &Inherited,
                                 bool allowClassRequirement,
                                 bool allowAnyObject);
   ParserStatus parseDeclItem(bool &PreviousHadSemi,

trunk/include/swift/Parse/SyntaxParsingContext.h

@@ -279,17 +279,9 @@ class alignas(1 << SyntaxAlignInBits) SyntaxParsingContext {
   }
 
   /// Returns the topmost Syntax node.
-  template <typename SyntaxNode> SyntaxNode topNode() {
-    ParsedRawSyntaxNode &TopNode = getStorage().back();
-    if (TopNode.isRecorded()) {
-      OpaqueSyntaxNode OpaqueNode = TopNode.getOpaqueNode();
-      return getSyntaxCreator().getLibSyntaxNodeFor<SyntaxNode>(OpaqueNode);
-    }
-    return getSyntaxCreator().createNode<SyntaxNode>(TopNode.copyDeferred());
-  }
+  template <typename SyntaxNode> SyntaxNode topNode();
 
-  template <typename SyntaxNode>
-  llvm::Optional<SyntaxNode> popIf() {
+  template <typename SyntaxNode> llvm::Optional<SyntaxNode> popIf() {
     auto &Storage = getStorage();
     if (Storage.size() <= Offset)
       return llvm::None;
@@ -376,5 +368,24 @@ class alignas(1 << SyntaxAlignInBits) SyntaxParsingContext {
                             "Only meant for use in the debugger");
 };
 
+template <typename SyntaxNode>
+inline SyntaxNode SyntaxParsingContext::topNode() {
+  ParsedRawSyntaxNode &TopNode = getStorage().back();
+  if (TopNode.isRecorded()) {
+    OpaqueSyntaxNode OpaqueNode = TopNode.getOpaqueNode();
+    return getSyntaxCreator().getLibSyntaxNodeFor<SyntaxNode>(OpaqueNode);
+  }
+  return getSyntaxCreator().createNode<SyntaxNode>(TopNode.copyDeferred());
+}
+
+template <> inline TokenSyntax SyntaxParsingContext::topNode<TokenSyntax>() {
+  ParsedRawSyntaxNode &TopNode = getStorage().back();
+  if (TopNode.isRecorded()) {
+    OpaqueSyntaxNode OpaqueNode = TopNode.getOpaqueNode();
+    return getSyntaxCreator().getLibSyntaxNodeFor<TokenSyntax>(OpaqueNode);
+  }
+  return getSyntaxCreator().createToken(TopNode.copyDeferred());
+}
+
 } // namespace swift
 #endif // SWIFT_SYNTAX_PARSING_CONTEXT_H