Skip to content

Commit be959d1

Browse files
ahoppenahoppen
authored
Merge pull request swiftlang#966 from ahoppen/ahoppen/function-parameter-to-parameter
Rename nameForDiagnostics 'function parameter' -> 'parameter'
2 parents 863f053 + ea88543 commit be959d1

File tree

8 files changed

+25
-42
lines changed

8 files changed

+25
-42
lines changed

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public let DECL_NODES: [Node] = [
9898
]),
9999

100100
Node(name: "FunctionParameterList",
101-
nameForDiagnostics: "function parameter list",
101+
nameForDiagnostics: "parameter list",
102102
kind: "SyntaxCollection",
103103
element: "FunctionParameter"),
104104

@@ -713,7 +713,7 @@ public let DECL_NODES: [Node] = [
713713
]),
714714

715715
Node(name: "FunctionParameter",
716-
nameForDiagnostics: "function parameter",
716+
nameForDiagnostics: "parameter",
717717
kind: "Syntax",
718718
traits: [
719719
"WithTrailingComma"

‎Sources/SwiftSyntax/gyb_generated/SyntaxEnum.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ public enum SyntaxEnum {
504504
case .associatedtypeDecl:
505505
return "associatedtype declaration"
506506
case .functionParameterList:
507-
return "function parameter list"
507+
return "parameter list"
508508
case .parameterClause:
509509
return "parameter clause"
510510
case .returnClause:
@@ -556,7 +556,7 @@ public enum SyntaxEnum {
556556
case .initializerClause:
557557
return nil
558558
case .functionParameter:
559-
return "function parameter"
559+
return "parameter"
560560
case .modifierList:
561561
return nil
562562
case .functionDecl:

‎Tests/SwiftParserTest/Declarations.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ final class DeclarationTests: XCTestCase {
574574
"(first second 1️⃣Int)",
575575
{ $0.parseFunctionSignature() },
576576
diagnostics: [
577-
DiagnosticSpec(message: "expected ':' in function parameter")
577+
DiagnosticSpec(message: "expected ':' in parameter")
578578
]
579579
)
580580
}
@@ -584,7 +584,7 @@ final class DeclarationTests: XCTestCase {
584584
"(first second 1️⃣third fourth: Int)",
585585
{ $0.parseFunctionSignature() },
586586
diagnostics: [
587-
DiagnosticSpec(message: "unexpected code 'third fourth' in function parameter")
587+
DiagnosticSpec(message: "unexpected code 'third fourth' in parameter")
588588
]
589589
)
590590
}
@@ -771,7 +771,7 @@ final class DeclarationTests: XCTestCase {
771771
trailingComma: nil
772772
)),
773773
diagnostics: [
774-
DiagnosticSpec(message: "unexpected code 'third' in function parameter")
774+
DiagnosticSpec(message: "unexpected code 'third' in parameter")
775775
]
776776
)
777777
}
@@ -793,7 +793,7 @@ final class DeclarationTests: XCTestCase {
793793
trailingComma: nil
794794
)),
795795
diagnostics: [
796-
DiagnosticSpec(message: "unexpected code 'third fourth' in function parameter")
796+
DiagnosticSpec(message: "unexpected code 'third fourth' in parameter")
797797
]
798798
)
799799
}
@@ -813,7 +813,7 @@ final class DeclarationTests: XCTestCase {
813813
trailingComma: nil
814814
)),
815815
diagnostics: [
816-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in function parameter"),
816+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
817817
DiagnosticSpec(locationMarker: "3️⃣", message: "expected ')' to end parameter clause"),
818818
DiagnosticSpec(locationMarker: "4️⃣", message: "expected name and member block in struct"),
819819
DiagnosticSpec(locationMarker: "4️⃣", message: "extraneous code ': Int) {}' at top level"),
@@ -843,7 +843,7 @@ final class DeclarationTests: XCTestCase {
843843
trailingComma: nil
844844
)),
845845
diagnostics: [
846-
DiagnosticSpec(message: "unexpected code '[third fourth]' in function parameter")
846+
DiagnosticSpec(message: "unexpected code '[third fourth]' in parameter")
847847
]
848848
)
849849
}
@@ -867,7 +867,7 @@ final class DeclarationTests: XCTestCase {
867867
trailingComma: nil
868868
)),
869869
diagnostics: [
870-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in function parameter"),
870+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
871871
DiagnosticSpec(locationMarker: "2️⃣" , message: "expected ']' to end array type"),
872872
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code 'fourth: Int' in parameter clause")
873873
]
@@ -892,7 +892,7 @@ final class DeclarationTests: XCTestCase {
892892
trailingComma: nil
893893
)),
894894
diagnostics: [
895-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in function parameter"),
895+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
896896
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ')' to end parameter clause"),
897897
DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code ': Int) {}' at top level")
898898
]

‎Tests/SwiftParserTest/translated/DollarIdentifierTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ final class DollarIdentifierTests: XCTestCase {
104104
// TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 10 - 11 = '`$`'
105105
DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in function"),
106106
DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code '$' before parameter clause"),
107-
DiagnosticSpec(locationMarker: "2️⃣", message: "expected type in function parameter"),
107+
DiagnosticSpec(locationMarker: "2️⃣", message: "expected type in parameter"),
108108
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '$ dollarParam: Int' in parameter clause"),
109109
// TODO: Old parser expected error on line 3: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 3 - 4 = '`$`'
110110
// TODO: Old parser expected error on line 3: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 5 - 6 = '`$`'

‎Tests/SwiftParserTest/translated/EnumTests.swift

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ final class EnumTests: XCTestCase {
104104
1️⃣case FloatingCase
105105
""",
106106
diagnostics: [
107-
// TODO: Old parser expected error on line 2: enum 'case' is not allowed outside of an enum
108107
DiagnosticSpec(message: "'case' can only appear inside a 'switch' statement or 'enum' declaration"),
109108
]
110109
)
@@ -116,10 +115,7 @@ final class EnumTests: XCTestCase {
116115
struct SomeStruct {
117116
case StructCase
118117
}
119-
""",
120-
diagnostics: [
121-
// TODO: Old parser expected error on line 2: enum 'case' is not allowed outside of an enum
122-
]
118+
"""
123119
)
124120
}
125121

@@ -129,10 +125,7 @@ final class EnumTests: XCTestCase {
129125
class SomeClass {
130126
case ClassCase
131127
}
132-
""",
133-
diagnostics: [
134-
// TODO: Old parser expected error on line 2: enum 'case' is not allowed outside of an enum
135-
]
128+
"""
136129
)
137130
}
138131

@@ -145,10 +138,7 @@ final class EnumTests: XCTestCase {
145138
extension EnumWithExtension1 {
146139
case A2
147140
}
148-
""",
149-
diagnostics: [
150-
// TODO: Old parser expected error on line 5: enum 'case' is not allowed outside of an enum
151-
]
141+
"""
152142
)
153143
}
154144

@@ -179,7 +169,6 @@ final class EnumTests: XCTestCase {
179169
}
180170
""",
181171
diagnostics: [
182-
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
183172
DiagnosticSpec(message: "unexpected code ':' in enum"),
184173
]
185174
)
@@ -193,7 +182,6 @@ final class EnumTests: XCTestCase {
193182
}
194183
""",
195184
diagnostics: [
196-
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
197185
DiagnosticSpec(message: "unexpected code ':' in enum"),
198186
]
199187
)
@@ -207,7 +195,6 @@ final class EnumTests: XCTestCase {
207195
}
208196
""",
209197
diagnostics: [
210-
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
211198
DiagnosticSpec(message: "unexpected code ':' in enum"),
212199
]
213200
)
@@ -221,7 +208,6 @@ final class EnumTests: XCTestCase {
221208
}
222209
""",
223210
diagnostics: [
224-
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
225211
DiagnosticSpec(message: "unexpected code 'where true:' in enum"),
226212
]
227213
)
@@ -235,7 +221,6 @@ final class EnumTests: XCTestCase {
235221
}
236222
""",
237223
diagnostics: [
238-
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
239224
DiagnosticSpec(message: "unexpected code ':' in enum"),
240225
]
241226
)
@@ -249,7 +234,6 @@ final class EnumTests: XCTestCase {
249234
}
250235
""",
251236
diagnostics: [
252-
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
253237
DiagnosticSpec(message: "unexpected code 'where true:' in enum"),
254238
]
255239
)
@@ -263,7 +247,6 @@ final class EnumTests: XCTestCase {
263247
}
264248
""",
265249
diagnostics: [
266-
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
267250
DiagnosticSpec(locationMarker: "1️⃣", message: "name can only start with a letter or underscore, not a number"),
268251
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code ':' in enum"),
269252
]
@@ -293,8 +276,8 @@ final class EnumTests: XCTestCase {
293276
""",
294277
diagnostics: [
295278
DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in enum case"),
296-
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ':' and type in function parameter"),
297-
DiagnosticSpec(locationMarker: "3️⃣", message: "expected type in function parameter"),
279+
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ':' and type in parameter"),
280+
DiagnosticSpec(locationMarker: "3️⃣", message: "expected type in parameter"),
298281
DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code '0' in parameter clause"),
299282
DiagnosticSpec(locationMarker: "4️⃣", message: "unexpected code ':' in enum"),
300283
], fixedSource: """

‎Tests/SwiftParserTest/translated/InitDeinitTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ final class InitDeinitTests: XCTestCase {
339339
""",
340340
diagnostics: [
341341
// TODO: Old parser expected error on line 3: missing 'self.' at initializer invocation, Fix-It replacements: 24 - 24 = 'self.'
342-
DiagnosticSpec(message: "expected type in function parameter"),
342+
DiagnosticSpec(message: "expected type in parameter"),
343343
DiagnosticSpec(message: "unexpected code '1' in parameter clause"),
344344
]
345345
)
@@ -356,7 +356,7 @@ final class InitDeinitTests: XCTestCase {
356356
""",
357357
diagnostics: [
358358
// TODO: Old parser expected error on line 3: missing 'super.' at initializer invocation, Fix-It replacements: 5 - 5 = 'super.'
359-
DiagnosticSpec(message: "expected type in function parameter"),
359+
DiagnosticSpec(message: "expected type in parameter"),
360360
DiagnosticSpec(message: "unexpected code '2' in parameter clause"),
361361
]
362362
)
@@ -372,7 +372,7 @@ final class InitDeinitTests: XCTestCase {
372372
""",
373373
diagnostics: [
374374
// TODO: Old parser expected error on line 3: missing 'self.' at initializer invocation, Fix-It replacements: 12 - 12 = 'self.'
375-
DiagnosticSpec(message: "expected type in function parameter"),
375+
DiagnosticSpec(message: "expected type in parameter"),
376376
DiagnosticSpec(message: "unexpected code '1' in parameter clause"),
377377
]
378378
)

‎Tests/SwiftParserTest/translated/InvalidTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ final class InvalidTests: XCTestCase {
227227
}
228228
""",
229229
diagnostics: [
230-
DiagnosticSpec(message: "expected ':' and type in function parameter"),
230+
DiagnosticSpec(message: "expected ':' and type in parameter"),
231231
]
232232
)
233233
}
@@ -283,7 +283,7 @@ final class InvalidTests: XCTestCase {
283283
""",
284284
diagnostics: [
285285
// TODO: Old parser expected warning on line 3: 'let' in this position is interpreted as an argument label, Fix-It replacements: 15 - 18 = '`let`'
286-
DiagnosticSpec(message: "unexpected code 'a' in function parameter"),
286+
DiagnosticSpec(message: "unexpected code 'a' in parameter"),
287287
]
288288
)
289289
}

‎gyb_syntax_support/DeclNodes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
is_optional=True),
5454
]),
5555

56-
Node('FunctionParameterList', name_for_diagnostics='function parameter list',
56+
Node('FunctionParameterList', name_for_diagnostics='parameter list',
5757
kind='SyntaxCollection', element='FunctionParameter'),
5858

5959
Node('ParameterClause', name_for_diagnostics='parameter clause', kind='Syntax',
@@ -374,7 +374,7 @@
374374
# parameter ->
375375
# external-parameter-name? local-parameter-name ':'
376376
# type '...'? '='? expression? ','?
377-
Node('FunctionParameter', name_for_diagnostics='function parameter', kind='Syntax',
377+
Node('FunctionParameter', name_for_diagnostics='parameter', kind='Syntax',
378378
traits=['WithTrailingComma'],
379379
children=[
380380
Child('Attributes', kind='AttributeList', name_for_diagnostics='attributes',

0 commit comments

Comments
 (0)