Skip to content

Commit 6fc14cb

Browse files
committed
[Macros] Move checkMacroDefinition() to SwiftSyntaxMacroExpansion module
Macro deifnition checking is only meant to be used by something that expands macros (e.g. compiler). Not for macro implementation.
1 parent 12bb25c commit 6fc14cb

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

Package.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,17 @@ let package = Package(
180180

181181
.target(
182182
name: "SwiftSyntaxMacroExpansion",
183-
dependencies: ["SwiftSyntax", "SwiftSyntaxMacros"],
183+
dependencies: ["SwiftSyntax", "SwiftSyntaxMacros", "SwiftDiagnostics"],
184184
exclude: ["CMakeLists.txt"]
185185
),
186186

187+
.testTarget(
188+
name: "SwiftSyntaxMacroExpansionTest",
189+
dependencies: [
190+
"SwiftSyntax", "_SwiftSyntaxTestSupport", "SwiftSyntaxMacroExpansion", "SwiftSyntaxBuilder",
191+
]
192+
),
193+
187194
// MARK: SwiftSyntaxMacrosTestSupport
188195

189196
.target(

Sources/SwiftSyntaxMacroExpansion/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
add_swift_host_library(SwiftSyntaxMacroExpansion
2+
FunctionParameterUtils.swift
23
MacroExpansion.swift
4+
MacroReplacement.swift
35
)
46

57
target_link_libraries(SwiftSyntaxMacroExpansion PUBLIC

Sources/SwiftSyntaxMacros/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ add_swift_host_library(SwiftSyntaxMacros
2222

2323
AbstractSourceLocation.swift
2424
BasicMacroExpansionContext.swift
25-
FunctionParameterUtils.swift
2625
MacroExpansionContext.swift
27-
MacroReplacement.swift
2826
MacroSystem.swift
2927
Syntax+MacroEvaluation.swift
3028
)

Tests/SwiftSyntaxMacrosTest/MacroReplacementTests.swift renamed to Tests/SwiftSyntaxMacroExpansionTest/MacroReplacementTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SwiftDiagnostics
14-
import SwiftParser
1514
import SwiftSyntax
1615
import SwiftSyntaxBuilder
17-
import SwiftSyntaxMacros
16+
import SwiftSyntaxMacroExpansion
1817
import _SwiftSyntaxTestSupport
1918
import XCTest
2019

0 commit comments

Comments
 (0)