Merge ef8e4ac into d26bdd3

Author: ahoppen

SwiftCompilerSources/CMakeLists.txt

@@ -256,7 +256,6 @@ else()
   #         The swift modules can now depend on that target.
   #         Note that this library is unused, i.e. not linked to anything.   
   add_library(importedHeaderDependencies "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp")
-  add_dependencies(importedHeaderDependencies swift-ast-generated-headers)
   target_include_directories(importedHeaderDependencies PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../include/swift")
 
   if(BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")

cmake/modules/AddSwift.cmake

@@ -8,7 +8,6 @@ include(SwiftCXXUtils)
 function(_swift_gyb_target_sources target scope)
   file(GLOB GYB_UNICODE_DATA ${SWIFT_SOURCE_DIR}/utils/UnicodeData/*)
   file(GLOB GYB_STDLIB_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_stdlib_support.py)
-  file(GLOB GYB_SYNTAX_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/*.py)
   file(GLOB GYB_SOURCEKIT_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/*.py)
   set(GYB_SOURCES
     ${SWIFT_SOURCE_DIR}/utils/gyb

include/swift/AST/Attr.def

@@ -8,10 +8,3 @@ set(generated_include_sources
     Attr.def.gyb
     TokenKinds.def.gyb)
 
-add_gyb_target(swift-ast-generated-headers
-    "${generated_include_sources}"
-    DEPENDS
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AttributeKinds.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Token.py")
-set_property(TARGET swift-ast-generated-headers
-    PROPERTY FOLDER "Miscellaneous")

include/swift/AST/Attr.def.gyb

@@ -1,10 +1,3 @@
-%{
-  # -*- mode: Swift -*-
-  from gyb_syntax_support.Token import *
-  # Ignore the following admonition it applies to the resulting .def file only
-}%
-//// Automatically Generated From TokenKinds.def.gyb.
-//// Do Not Edit Directly!
 //===--- TokenKinds.def - Swift Tokenizer Metaprogramming -----------------===//
 //
 // This source file is part of the Swift.org open source project
@@ -144,15 +137,128 @@
 #endif
 
 // Keywords that start decls.
-% for token in SYNTAX_TOKENS:
-%   if isinstance(token, Punctuator):
-${token.macro_name()}(${token.unprefixed_kind}, "${token.text}")
-%   elif isinstance(token, PoundObjectLiteral):
-${token.macro_name()}(${token.unprefixed_kind}, "${token.description}", ${token.protocol})
-%   else:
-${token.macro_name()}(${token.unprefixed_kind})
-%   end
-%   end
+DECL_KEYWORD(associatedtype)
+DECL_KEYWORD(class)
+DECL_KEYWORD(deinit)
+DECL_KEYWORD(enum)
+DECL_KEYWORD(extension)
+DECL_KEYWORD(func)
+DECL_KEYWORD(import)
+DECL_KEYWORD(init)
+DECL_KEYWORD(inout)
+DECL_KEYWORD(let)
+DECL_KEYWORD(operator)
+DECL_KEYWORD(precedencegroup)
+DECL_KEYWORD(protocol)
+DECL_KEYWORD(struct)
+DECL_KEYWORD(subscript)
+DECL_KEYWORD(typealias)
+DECL_KEYWORD(var)
+DECL_KEYWORD(fileprivate)
+DECL_KEYWORD(internal)
+DECL_KEYWORD(private)
+DECL_KEYWORD(public)
+DECL_KEYWORD(static)
+STMT_KEYWORD(defer)
+STMT_KEYWORD(if)
+STMT_KEYWORD(guard)
+STMT_KEYWORD(do)
+STMT_KEYWORD(repeat)
+STMT_KEYWORD(else)
+STMT_KEYWORD(for)
+STMT_KEYWORD(in)
+STMT_KEYWORD(while)
+STMT_KEYWORD(return)
+STMT_KEYWORD(break)
+STMT_KEYWORD(continue)
+STMT_KEYWORD(fallthrough)
+STMT_KEYWORD(switch)
+STMT_KEYWORD(case)
+STMT_KEYWORD(default)
+STMT_KEYWORD(where)
+STMT_KEYWORD(catch)
+STMT_KEYWORD(throw)
+EXPR_KEYWORD(as)
+EXPR_KEYWORD(Any)
+EXPR_KEYWORD(false)
+EXPR_KEYWORD(is)
+EXPR_KEYWORD(nil)
+EXPR_KEYWORD(rethrows)
+EXPR_KEYWORD(super)
+EXPR_KEYWORD(self)
+EXPR_KEYWORD(Self)
+EXPR_KEYWORD(true)
+EXPR_KEYWORD(try)
+EXPR_KEYWORD(throws)
+PAT_KEYWORD(_)
+PUNCTUATOR(l_paren, "(")
+PUNCTUATOR(r_paren, ")")
+PUNCTUATOR(l_brace, "{")
+PUNCTUATOR(r_brace, "}")
+PUNCTUATOR(l_square, "[")
+PUNCTUATOR(r_square, "]")
+PUNCTUATOR(l_angle, "<")
+PUNCTUATOR(r_angle, ">")
+PUNCTUATOR(period, ".")
+PUNCTUATOR(period_prefix, ".")
+PUNCTUATOR(comma, ",")
+PUNCTUATOR(ellipsis, "...")
+PUNCTUATOR(colon, ":")
+PUNCTUATOR(semi, ";")
+PUNCTUATOR(equal, "=")
+PUNCTUATOR(at_sign, "@")
+PUNCTUATOR(pound, "#")
+PUNCTUATOR(amp_prefix, "&")
+PUNCTUATOR(arrow, "->")
+PUNCTUATOR(backtick, "`")
+PUNCTUATOR(backslash, "\\")
+PUNCTUATOR(exclaim_postfix, "!")
+PUNCTUATOR(question_postfix, "?")
+PUNCTUATOR(question_infix, "?")
+PUNCTUATOR(string_quote, "\"")
+PUNCTUATOR(single_quote, "\'")
+PUNCTUATOR(multiline_string_quote, "\"\"\"")
+POUND_KEYWORD(keyPath)
+POUND_KEYWORD(line)
+POUND_KEYWORD(selector)
+POUND_KEYWORD(file)
+POUND_KEYWORD(fileID)
+POUND_KEYWORD(filePath)
+POUND_KEYWORD(column)
+POUND_KEYWORD(function)
+POUND_KEYWORD(dsohandle)
+POUND_KEYWORD(assert)
+POUND_DIRECTIVE_KEYWORD(sourceLocation)
+POUND_DIRECTIVE_KEYWORD(warning)
+POUND_DIRECTIVE_KEYWORD(error)
+POUND_COND_DIRECTIVE_KEYWORD(if)
+POUND_COND_DIRECTIVE_KEYWORD(else)
+POUND_COND_DIRECTIVE_KEYWORD(elseif)
+POUND_COND_DIRECTIVE_KEYWORD(endif)
+POUND_CONFIG(available)
+POUND_CONFIG(unavailable)
+POUND_OBJECT_LITERAL(fileLiteral, "file reference", ExpressibleByFileReferenceLiteral)
+POUND_OBJECT_LITERAL(imageLiteral, "image", ExpressibleByImageLiteral)
+POUND_OBJECT_LITERAL(colorLiteral, "color", ExpressibleByColorLiteral)
+POUND_CONFIG(_hasSymbol)
+LITERAL(integer_literal)
+LITERAL(floating_literal)
+LITERAL(string_literal)
+LITERAL(regex_literal)
+MISC(unknown)
+MISC(identifier)
+MISC(oper_binary_unspaced)
+MISC(oper_binary_spaced)
+MISC(oper_postfix)
+MISC(oper_prefix)
+MISC(dollarident)
+MISC(contextual_keyword)
+MISC(raw_string_delimiter)
+MISC(string_segment)
+MISC(string_interpolation_anchor)
+MISC(kw_yield)
+MISC(kw_forget)
+MISC(kw_discard)
 
 // The following tokens are irrelevant for swiftSyntax and thus only declared 
 // in this .def file

include/swift/AST/CMakeLists.txt

@@ -166,11 +166,4 @@ target_link_libraries(swiftAST
   PUBLIC swiftBasic
   PRIVATE swiftMarkup)
 
-# intrinsics_gen is the LLVM tablegen target that generates the include files
-# where intrinsics and attributes are declared. swiftAST depends on these
-# headers.
-# For more information see the comment at the top of lib/CMakeLists.txt.
-add_dependencies(swift-ast-generated-headers intrinsics_gen clang-tablegen-targets)
-add_dependencies(swiftAST swift-ast-generated-headers)
-
 set_swift_llvm_is_available(swiftAST)

include/swift/AST/TokenKinds.def.gyb renamed to include/swift/AST/TokenKinds.def

@@ -12,9 +12,6 @@
 # directory.
 list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen clang-tablegen-targets)
 
-# Add generated Swift Syntax headers to global dependencies.
-list(APPEND LLVM_COMMON_DEPENDS swift-ast-generated-headers)
-
 # Set up for linking against swift-syntax.
 if (SWIFT_SWIFT_PARSER)
   # Set up linking against the swift-syntax modules.