Skip to content

Commit eb3ddb8

Browse files
asgerfasgerf
authored
Merge pull request #22498 from asgerf/unified/loosen-schema
Unified: loosen AST schema
2 parents 3a0ce1d + c145fc5 commit eb3ddb8

147 files changed

Lines changed: 2021 additions & 2488 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎unified/extractor/ast_types.yml‎

Lines changed: 69 additions & 145 deletions
Large diffs are not rendered by default.

‎unified/extractor/src/languages/swift/swift.rs‎

Lines changed: 118 additions & 148 deletions
Large diffs are not rendered by default.

‎unified/extractor/tests/corpus/swift/closures/closure-with-capture-list.output‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,18 @@ top_level
6666
stmt:
6767
variable_declaration
6868
modifier: modifier "let"
69-
pattern:
70-
name_pattern
71-
identifier: identifier "f"
69+
pattern: identifier "f"
7270
value:
7371
function_expr
7472
capture_declaration:
7573
variable_declaration
7674
modifier: modifier "weak"
77-
pattern:
78-
name_pattern
79-
identifier: identifier "self"
75+
pattern: identifier "self"
8076
body:
8177
block
8278
stmt:
8379
call_expr
8480
callee:
8581
member_access_expr
86-
base:
87-
name_expr
88-
identifier: identifier "self"
89-
member: identifier "doThing"
82+
base: identifier "self"
83+
member_name_node: identifier "doThing"

‎unified/extractor/tests/corpus/swift/closures/closure-with-explicit-parameters.output‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,28 +68,18 @@ top_level
6868
stmt:
6969
variable_declaration
7070
modifier: modifier "let"
71-
pattern:
72-
name_pattern
73-
identifier: identifier "f"
71+
pattern: identifier "f"
7472
value:
7573
function_expr
7674
parameter:
7775
parameter
78-
type:
79-
named_type_expr
80-
name: identifier "Int"
81-
pattern:
82-
name_pattern
83-
identifier: identifier "x"
84-
return_type:
85-
named_type_expr
86-
name: identifier "Int"
76+
type: identifier "Int"
77+
pattern: identifier "x"
78+
return_type: identifier "Int"
8779
body:
8880
block
8981
stmt:
9082
binary_expr
91-
left:
92-
name_expr
93-
identifier: identifier "x"
83+
left: identifier "x"
9484
operator: infix_operator "*"
9585
right: int_literal "2"

‎unified/extractor/tests/corpus/swift/closures/closure-with-shorthand-parameters.output‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,13 @@ top_level
4545
stmt:
4646
variable_declaration
4747
modifier: modifier "let"
48-
pattern:
49-
name_pattern
50-
identifier: identifier "f"
48+
pattern: identifier "f"
5149
value:
5250
function_expr
5351
body:
5452
block
5553
stmt:
5654
binary_expr
57-
left:
58-
name_expr
59-
identifier: identifier "$0"
55+
left: identifier "$0"
6056
operator: infix_operator "+"
61-
right:
62-
name_expr
63-
identifier: identifier "$1"
57+
right: identifier "$1"

‎unified/extractor/tests/corpus/swift/closures/multi-statement-closure.output‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -99,42 +99,28 @@ top_level
9999
stmt:
100100
variable_declaration
101101
modifier: modifier "let"
102-
pattern:
103-
name_pattern
104-
identifier: identifier "f"
102+
pattern: identifier "f"
105103
value:
106104
function_expr
107105
parameter:
108106
parameter
109-
type:
110-
named_type_expr
111-
name: identifier "Int"
112-
pattern:
113-
name_pattern
114-
identifier: identifier "x"
115-
return_type:
116-
named_type_expr
117-
name: identifier "Int"
107+
type: identifier "Int"
108+
pattern: identifier "x"
109+
return_type: identifier "Int"
118110
body:
119111
block
120112
stmt:
121113
variable_declaration
122114
modifier: modifier "let"
123-
pattern:
124-
name_pattern
125-
identifier: identifier "y"
115+
pattern: identifier "y"
126116
value:
127117
binary_expr
128-
left:
129-
name_expr
130-
identifier: identifier "x"
118+
left: identifier "x"
131119
operator: infix_operator "+"
132120
right: int_literal "1"
133121
return_expr
134122
value:
135123
binary_expr
136-
left:
137-
name_expr
138-
identifier: identifier "y"
124+
left: identifier "y"
139125
operator: infix_operator "*"
140126
right: int_literal "2"

‎unified/extractor/tests/corpus/swift/closures/trailing-closure.output‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,8 @@ top_level
4646
call_expr
4747
callee:
4848
member_access_expr
49-
base:
50-
name_expr
51-
identifier: identifier "xs"
52-
member: identifier "map"
49+
base: identifier "xs"
50+
member_name_node: identifier "map"
5351
argument:
5452
argument
5553
value:
@@ -58,8 +56,6 @@ top_level
5856
block
5957
stmt:
6058
binary_expr
61-
left:
62-
name_expr
63-
identifier: identifier "$0"
59+
left: identifier "$0"
6460
operator: infix_operator "*"
6561
right: int_literal "2"

‎unified/extractor/tests/corpus/swift/collections/array-literal.output‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ top_level
4747
stmt:
4848
variable_declaration
4949
modifier: modifier "let"
50-
pattern:
51-
name_pattern
52-
identifier: identifier "xs"
50+
pattern: identifier "xs"
5351
value:
5452
array_literal
5553
element:

‎unified/extractor/tests/corpus/swift/collections/dictionary-literal.output‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,5 @@ top_level
5858
stmt:
5959
variable_declaration
6060
modifier: modifier "let"
61-
pattern:
62-
name_pattern
63-
identifier: identifier "d"
61+
pattern: identifier "d"
6462
value: map_literal "[\"a\": 1, \"b\": 2]"

‎unified/extractor/tests/corpus/swift/collections/dictionary-subscript.output‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,10 @@ top_level
4747
stmt:
4848
variable_declaration
4949
modifier: modifier "let"
50-
pattern:
51-
name_pattern
52-
identifier: identifier "v"
50+
pattern: identifier "v"
5351
value:
5452
call_expr
55-
callee:
56-
name_expr
57-
identifier: identifier "d"
53+
callee: identifier "d"
5854
argument:
5955
argument
6056
value: string_literal "\"key\""

0 commit comments

Comments
 (0)