Skip to content

Remove _CSwiftSyntax module #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 1 addition & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -68,7 +61,7 @@ let package = Package(
),
.target(
name: "SwiftSyntax",
dependencies: ["_CSwiftSyntax"],
dependencies: [],
exclude: [
"CMakeLists.txt",
"Misc.swift.gyb",
Expand Down
1 change: 0 additions & 1 deletion Sources/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
21 changes: 0 additions & 21 deletions Sources/SwiftSyntax/AtomicCounter.swift

This file was deleted.

4 changes: 0 additions & 4 deletions Sources/SwiftSyntax/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

add_library(SwiftSyntax STATIC
AbsolutePosition.swift
AtomicCounter.swift
BumpPtrAllocator.swift
IncrementalParseTransition.swift
SourceLength.swift
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//
//===----------------------------------------------------------------------===//

@_implementationOnly import _CSwiftSyntax
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a line I forgot to remove in #614

@_spi(RawSyntax) import SwiftSyntax

extension RawSyntax {
Expand Down
12 changes: 0 additions & 12 deletions Sources/_CSwiftSyntax/CMakeLists.txt

This file was deleted.

9 changes: 0 additions & 9 deletions Sources/_CSwiftSyntax/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions Sources/_CSwiftSyntax/include/atomic-counter.h

This file was deleted.

77 changes: 0 additions & 77 deletions Sources/_CSwiftSyntax/include/c-syntax-nodes.h

This file was deleted.

3 changes: 0 additions & 3 deletions Sources/_CSwiftSyntax/include/module.modulemap

This file was deleted.

6 changes: 0 additions & 6 deletions Sources/_CSwiftSyntax/src/atomic-counter.c

This file was deleted.

18 changes: 0 additions & 18 deletions build-script.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 " +
Expand Down
1 change: 0 additions & 1 deletion utils/group.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
],
"Internal": [
"SyntaxArena.swift",
"AtomicCounter.swift",
"SyntaxVerifier.swift",
"BumpPtrAllocator.swift",
]
Expand Down