Remove _CSwiftSyntax.

Since we stopped using `AtomicCounter`, `SwiftSyntax` does not depends on
`_CSwiftSyntax` anymore. `CNodes` for `SwiftSyntaxParser` is provided by
`_InternalSwiftSyntaxParser` module.

Author: rintaro

CMakeLists.txt

@@ -13,9 +13,6 @@ project(SwiftSyntax LANGUAGES C Swift)
 set(SWIFT_VERSION 5)
 set(CMAKE_Swift_LANGUAGE_VERSION ${SWIFT_VERSION})
 
-# ensure Swift compiler can find _CSwiftSyntax
-add_compile_options($<$<COMPILE_LANGUAGE:Swift>:-I$<SEMICOLON>${CMAKE_CURRENT_SOURCE_DIR}/Sources/_CSwiftSyntax/include>)
-
 set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

Package.swift

@@ -52,13 +52,6 @@ let package = Package(
     .executable(name: "generate-swift-syntax-builder", targets: ["generate-swift-syntax-builder"])
   ],
   targets: [
-    .target(
-      name: "_CSwiftSyntax",
-      exclude: [
-        "CMakeLists.txt",
-        "README.md"
-      ]
-    ),
     .target(
       name: "SwiftDiagnostics",
       dependencies: ["SwiftSyntax"],
@@ -68,7 +61,7 @@ let package = Package(
     ),
     .target(
       name: "SwiftSyntax",
-      dependencies: ["_CSwiftSyntax"],
+      dependencies: [],
       exclude: [
         "CMakeLists.txt",
         "Misc.swift.gyb",

Sources/CMakeLists.txt

@@ -6,7 +6,6 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_subdirectory(_CSwiftSyntax)
 add_subdirectory(SwiftSyntax)
 add_subdirectory(SwiftDiagnostics)
 add_subdirectory(SwiftParser)

Sources/SwiftSyntax/AtomicCounter.swift

@@ -8,7 +8,6 @@
 
 add_library(SwiftSyntax STATIC
   AbsolutePosition.swift
-  AtomicCounter.swift
   BumpPtrAllocator.swift
   IncrementalParseTransition.swift
   SourceLength.swift
@@ -56,9 +55,6 @@ add_library(SwiftSyntax STATIC
   gyb_generated/syntax_nodes/SyntaxTypeNodes.swift
 )
 
-target_link_libraries(SwiftSyntax PRIVATE
-  _CSwiftSyntax)
-
 set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftSyntax)
 
 # NOTE: workaround for CMake not setting up include flags yet

Sources/SwiftSyntax/CMakeLists.txt

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_implementationOnly import _CSwiftSyntax
 @_spi(RawSyntax) import SwiftSyntax
 
 extension RawSyntax {

Sources/SwiftSyntaxParser/RawSyntax+CSwiftSyntax.swift renamed to Sources/SwiftSyntaxParser/RawSyntax+CNodes.swift

@@ -546,22 +546,6 @@ def check_generated_files_match(self_generated_dir: str,
     check_call(command)
 
 
-def verify_c_syntax_nodes_match() -> None:
-    print("** Validating that the C data types match **")
-
-    swift_syntax_c_definitions = os.path.join(
-        SOURCES_DIR, "_CSwiftSyntax", "include", "c-syntax-nodes.h")
-    swiftc_c_definitions = os.path.join(
-        SWIFT_DIR, "include", "swift-c", "SyntaxParser",
-        "SwiftSyntaxCDataTypes.h")
-
-    check_call([
-        "diff",
-        swift_syntax_c_definitions,
-        swiftc_c_definitions,
-    ])
-
-
 def run_tests(
     toolchain: str, build_dir: Optional[str], multiroot_data_file: Optional[str],
     release: bool, filecheck_exec: Optional[str], skip_lit_tests: bool, verbose: bool
@@ -748,8 +732,6 @@ def verify_source_code_command(args: argparse.Namespace) -> None:
             release=args.release,
             verbose=args.verbose,
         )
-
-        verify_c_syntax_nodes_match()
     except subprocess.CalledProcessError:
         printerr(
             "FAIL: Gyb-generated files committed to repository do " +

Sources/_CSwiftSyntax/CMakeLists.txt

@@ -53,7 +53,6 @@
   ],
   "Internal": [
     "SyntaxArena.swift",
-    "AtomicCounter.swift",
     "SyntaxVerifier.swift",
     "BumpPtrAllocator.swift",
   ]