Skip to content

Commit 04e0483

Browse files
leogdionleogdion
committed
finishing spliting files
1 parent f0a2080 commit 04e0483

6 files changed

Lines changed: 209 additions & 122 deletions

File tree

‎Sources/SyntaxKit/SwitchCase.swift‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
// Permission is hereby granted, free of charge, to any person
99
// obtaining a copy of this software and associated documentation
10-
// files (the “Software”), to deal in the Software without
10+
// files (the "Software"), to deal in the Software without
1111
// restriction, including without limitation the rights to use,
1212
// copy, modify, merge, publish, distribute, sublicense, and/or
1313
// sell copies of the Software, and to permit persons to whom the
@@ -17,7 +17,7 @@
1717
// The above copyright notice and this permission notice shall be
1818
// included in all copies or substantial portions of the Software.
1919
//
20-
// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
20+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
2121
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
2222
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
2323
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
@@ -29,31 +29,6 @@
2929

3030
import SwiftSyntax
3131

32-
/// A value binding pattern for use in switch cases.
33-
public struct SwitchLet: PatternConvertible, CodeBlock {
34-
internal let name: String
35-
36-
/// Creates a value binding pattern for a switch case.
37-
/// - Parameter name: The name of the variable to bind.
38-
public init(_ name: String) {
39-
self.name = name
40-
}
41-
42-
public var patternSyntax: PatternSyntax {
43-
let identifier = IdentifierPatternSyntax(identifier: .identifier(name))
44-
return PatternSyntax(
45-
ValueBindingPatternSyntax(
46-
bindingSpecifier: .keyword(.let, trailingTrivia: .space),
47-
pattern: identifier
48-
))
49-
}
50-
51-
public var syntax: SyntaxProtocol {
52-
// For CodeBlock conformance, return the pattern syntax
53-
patternSyntax
54-
}
55-
}
56-
5732
/// A `case` in a `switch` statement.
5833
public struct SwitchCase: CodeBlock {
5934
private let patterns: [Any]

‎Sources/SyntaxKit/SwitchLet.swift‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
//
2+
// SwitchLet.swift
3+
// SyntaxKit
4+
//
5+
// Created by Leo Dion.
6+
// Copyright © 2025 BrightDigit.
7+
//
8+
// Permission is hereby granted, free of charge, to any person
9+
// obtaining a copy of this software and associated documentation
10+
// files (the "Software"), to deal in the Software without
11+
// restriction, including without limitation the rights to use,
12+
// copy, modify, merge, publish, distribute, sublicense, and/or
13+
// sell copies of the Software, and to permit persons to whom the
14+
// Software is furnished to do so, subject to the following
15+
// conditions:
16+
//
17+
// The above copyright notice and this permission notice shall be
18+
// included in all copies or substantial portions of the Software.
19+
//
20+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
21+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
22+
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
23+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
24+
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
25+
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
26+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
27+
// OTHER DEALINGS IN THE SOFTWARE.
28+
//
29+
30+
import SwiftSyntax
31+
32+
/// A value binding pattern for use in switch cases.
33+
public struct SwitchLet: PatternConvertible, CodeBlock {
34+
internal let name: String
35+
36+
/// Creates a value binding pattern for a switch case.
37+
/// - Parameter name: The name of the variable to bind.
38+
public init(_ name: String) {
39+
self.name = name
40+
}
41+
42+
public var patternSyntax: PatternSyntax {
43+
let identifier = IdentifierPatternSyntax(identifier: .identifier(name))
44+
return PatternSyntax(
45+
ValueBindingPatternSyntax(
46+
bindingSpecifier: .keyword(.let, trailingTrivia: .space),
47+
pattern: identifier
48+
))
49+
}
50+
51+
public var syntax: SyntaxProtocol {
52+
// For CodeBlock conformance, return the pattern syntax
53+
patternSyntax
54+
}
55+
}

‎Sources/SyntaxKit/Tuple.swift‎

Lines changed: 2 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
// Permission is hereby granted, free of charge, to any person
99
// obtaining a copy of this software and associated documentation
10-
// files (the “Software”), to deal in the Software without
10+
// files (the "Software"), to deal in the Software without
1111
// restriction, including without limitation the rights to use,
1212
// copy, modify, merge, publish, distribute, sublicense, and/or
1313
// sell copies of the Software, and to permit persons to whom the
@@ -17,7 +17,7 @@
1717
// The above copyright notice and this permission notice shall be
1818
// included in all copies or substantial portions of the Software.
1919
//
20-
// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
20+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
2121
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
2222
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
2323
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
@@ -81,93 +81,3 @@ public struct Tuple: CodeBlock {
8181
return tupleExpr
8282
}
8383
}
84-
85-
/// A tuple pattern for switch cases.
86-
public struct TuplePattern: PatternConvertible {
87-
private let elements: [PatternConvertible?]
88-
89-
internal init(elements: [PatternConvertible?]) {
90-
self.elements = elements
91-
}
92-
93-
public var patternSyntax: PatternSyntax {
94-
let patternElements = TuplePatternElementListSyntax(
95-
elements.enumerated().map { index, element in
96-
let patternElement: TuplePatternElementSyntax
97-
if let element = element {
98-
patternElement = TuplePatternElementSyntax(
99-
label: nil,
100-
colon: nil,
101-
pattern: element.patternSyntax,
102-
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
103-
)
104-
} else {
105-
// Wildcard pattern
106-
patternElement = TuplePatternElementSyntax(
107-
label: nil,
108-
colon: nil,
109-
pattern: PatternSyntax(WildcardPatternSyntax(wildcard: .wildcardToken())),
110-
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
111-
)
112-
}
113-
return patternElement
114-
}
115-
)
116-
117-
return PatternSyntax(
118-
TuplePatternSyntax(
119-
leftParen: .leftParenToken(),
120-
elements: patternElements,
121-
rightParen: .rightParenToken()
122-
)
123-
)
124-
}
125-
}
126-
127-
/// A tuple pattern that can be used as a CodeBlock for for-in loops.
128-
public struct TuplePatternCodeBlock: CodeBlock, PatternConvertible {
129-
private let elements: [PatternConvertible?]
130-
131-
internal init(elements: [PatternConvertible?]) {
132-
self.elements = elements
133-
}
134-
135-
public var patternSyntax: PatternSyntax {
136-
let patternElements = TuplePatternElementListSyntax(
137-
elements.enumerated().map { index, element in
138-
let patternElement: TuplePatternElementSyntax
139-
if let element = element {
140-
patternElement = TuplePatternElementSyntax(
141-
label: nil,
142-
colon: nil,
143-
pattern: element.patternSyntax,
144-
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
145-
)
146-
} else {
147-
// Wildcard pattern
148-
patternElement = TuplePatternElementSyntax(
149-
label: nil,
150-
colon: nil,
151-
pattern: PatternSyntax(WildcardPatternSyntax(wildcard: .wildcardToken())),
152-
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
153-
)
154-
}
155-
return patternElement
156-
}
157-
)
158-
159-
return PatternSyntax(
160-
TuplePatternSyntax(
161-
leftParen: .leftParenToken(),
162-
elements: patternElements,
163-
rightParen: .rightParenToken()
164-
)
165-
)
166-
}
167-
168-
public var syntax: SyntaxProtocol {
169-
// For CodeBlock conformance, we return the pattern syntax as an expression
170-
// This is a bit of a hack, but it allows us to use TuplePatternCodeBlock in For loops
171-
patternSyntax
172-
}
173-
}

‎Sources/SyntaxKit/TuplePattern.swift‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
//
2+
// TuplePattern.swift
3+
// SyntaxKit
4+
//
5+
// Created by Leo Dion.
6+
// Copyright © 2025 BrightDigit.
7+
//
8+
// Permission is hereby granted, free of charge, to any person
9+
// obtaining a copy of this software and associated documentation
10+
// files (the "Software"), to deal in the Software without
11+
// restriction, including without limitation the rights to use,
12+
// copy, modify, merge, publish, distribute, sublicense, and/or
13+
// sell copies of the Software, and to permit persons to whom the
14+
// Software is furnished to do so, subject to the following
15+
// conditions:
16+
//
17+
// The above copyright notice and this permission notice shall be
18+
// included in all copies or substantial portions of the Software.
19+
//
20+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
21+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
22+
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
23+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
24+
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
25+
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
26+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
27+
// OTHER DEALINGS IN THE SOFTWARE.
28+
//
29+
30+
import SwiftSyntax
31+
32+
/// A tuple pattern for switch cases.
33+
public struct TuplePattern: PatternConvertible {
34+
private let elements: [PatternConvertible?]
35+
36+
internal init(elements: [PatternConvertible?]) {
37+
self.elements = elements
38+
}
39+
40+
public var patternSyntax: PatternSyntax {
41+
let patternElements = TuplePatternElementListSyntax(
42+
elements.enumerated().map { index, element in
43+
let patternElement: TuplePatternElementSyntax
44+
if let element = element {
45+
patternElement = TuplePatternElementSyntax(
46+
label: nil,
47+
colon: nil,
48+
pattern: element.patternSyntax,
49+
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
50+
)
51+
} else {
52+
// Wildcard pattern
53+
patternElement = TuplePatternElementSyntax(
54+
label: nil,
55+
colon: nil,
56+
pattern: PatternSyntax(WildcardPatternSyntax(wildcard: .wildcardToken())),
57+
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
58+
)
59+
}
60+
return patternElement
61+
}
62+
)
63+
64+
return PatternSyntax(
65+
TuplePatternSyntax(
66+
leftParen: .leftParenToken(),
67+
elements: patternElements,
68+
rightParen: .rightParenToken()
69+
)
70+
)
71+
}
72+
}

‎Sources/SyntaxKit/TuplePatternCodeBlock.swift‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
//
2+
// TuplePatternCodeBlock.swift
3+
// SyntaxKit
4+
//
5+
// Created by Leo Dion.
6+
// Copyright © 2025 BrightDigit.
7+
//
8+
// Permission is hereby granted, free of charge, to any person
9+
// obtaining a copy of this software and associated documentation
10+
// files (the "Software"), to deal in the Software without
11+
// restriction, including without limitation the rights to use,
12+
// copy, modify, merge, publish, distribute, sublicense, and/or
13+
// sell copies of the Software, and to permit persons to whom the
14+
// Software is furnished to do so, subject to the following
15+
// conditions:
16+
//
17+
// The above copyright notice and this permission notice shall be
18+
// included in all copies or substantial portions of the Software.
19+
//
20+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
21+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
22+
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
23+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
24+
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
25+
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
26+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
27+
// OTHER DEALINGS IN THE SOFTWARE.
28+
//
29+
30+
import SwiftSyntax
31+
32+
/// A tuple pattern that can be used as a CodeBlock for for-in loops.
33+
public struct TuplePatternCodeBlock: CodeBlock, PatternConvertible {
34+
private let elements: [PatternConvertible?]
35+
36+
internal init(elements: [PatternConvertible?]) {
37+
self.elements = elements
38+
}
39+
40+
public var patternSyntax: PatternSyntax {
41+
let patternElements = TuplePatternElementListSyntax(
42+
elements.enumerated().map { index, element in
43+
let patternElement: TuplePatternElementSyntax
44+
if let element = element {
45+
patternElement = TuplePatternElementSyntax(
46+
label: nil,
47+
colon: nil,
48+
pattern: element.patternSyntax,
49+
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
50+
)
51+
} else {
52+
// Wildcard pattern
53+
patternElement = TuplePatternElementSyntax(
54+
label: nil,
55+
colon: nil,
56+
pattern: PatternSyntax(WildcardPatternSyntax(wildcard: .wildcardToken())),
57+
trailingComma: index < elements.count - 1 ? .commaToken(trailingTrivia: .space) : nil
58+
)
59+
}
60+
return patternElement
61+
}
62+
)
63+
64+
return PatternSyntax(
65+
TuplePatternSyntax(
66+
leftParen: .leftParenToken(),
67+
elements: patternElements,
68+
rightParen: .rightParenToken()
69+
)
70+
)
71+
}
72+
73+
public var syntax: SyntaxProtocol {
74+
// For CodeBlock conformance, we return the pattern syntax as an expression
75+
// This is a bit of a hack, but it allows us to use TuplePatternCodeBlock in For loops
76+
patternSyntax
77+
}
78+
}

‎Tests/SyntaxKitTests/Integration/BasicTests.swift‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)