Skip to content

Commit ad60bca

Browse files
sbdchdsbdchd
authored
parser: normal ast node names (#495)
- Remove the `_STMT` suffix - Add missing nodes to grammar
1 parent 0f969bc commit ad60bca

File tree

167 files changed

+4630
-3134
lines changed

Some content is hidden

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

167 files changed

+4630
-3134
lines changed

‎crates/squawk_parser/src/generated/syntax_kind.rs‎

Lines changed: 158 additions & 160 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/squawk_parser/src/grammar.rs‎

Lines changed: 175 additions & 182 deletions
Large diffs are not rendered by default.

‎crates/squawk_parser/src/lib.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -541,13 +541,6 @@ impl<'t> Parser<'t> {
541541
SyntaxKind::NOT_KW,
542542
TrivaBetween::Allowed,
543543
),
544-
// is null
545-
SyntaxKind::IS_NULL => self.at_composite2(
546-
n,
547-
SyntaxKind::IS_KW,
548-
SyntaxKind::NULL_KW,
549-
TrivaBetween::Allowed,
550-
),
551544
// not like
552545
SyntaxKind::NOT_LIKE => self.at_composite2(
553546
n,

‎crates/squawk_parser/tests/snapshots/tests__alter_collation_ok.snap‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
---
22
source: crates/squawk_parser/tests/tests.rs
33
input_file: crates/squawk_parser/tests/data/ok/alter_collation.sql
4-
snapshot_kind: text
54
---
65
SOURCE_FILE
76
COMMENT "-- refresh"
87
WHITESPACE "\n"
9-
ALTER_COLLATION_STMT
8+
ALTER_COLLATION
109
ALTER_KW "alter"
1110
WHITESPACE " "
1211
COLLATION_KW "collation"
@@ -23,7 +22,7 @@ SOURCE_FILE
2322
WHITESPACE "\n\n"
2423
COMMENT "-- rename"
2524
WHITESPACE "\n"
26-
ALTER_COLLATION_STMT
25+
ALTER_COLLATION
2726
ALTER_KW "alter"
2827
WHITESPACE " "
2928
COLLATION_KW "collation"
@@ -43,7 +42,7 @@ SOURCE_FILE
4342
WHITESPACE "\n\n"
4443
COMMENT "-- owner"
4544
WHITESPACE "\n"
46-
ALTER_COLLATION_STMT
45+
ALTER_COLLATION
4746
ALTER_KW "alter"
4847
WHITESPACE " "
4948
COLLATION_KW "collation"
@@ -60,7 +59,7 @@ SOURCE_FILE
6059
IDENT "u"
6160
SEMICOLON ";"
6261
WHITESPACE "\n"
63-
ALTER_COLLATION_STMT
62+
ALTER_COLLATION
6463
ALTER_KW "alter"
6564
WHITESPACE " "
6665
COLLATION_KW "collation"
@@ -84,7 +83,7 @@ SOURCE_FILE
8483
WHITESPACE "\n\n"
8584
COMMENT "-- set_schema"
8685
WHITESPACE "\n"
87-
ALTER_COLLATION_STMT
86+
ALTER_COLLATION
8887
ALTER_KW "alter"
8988
WHITESPACE " "
9089
COLLATION_KW "collation"

‎crates/squawk_parser/tests/snapshots/tests__alter_conversion_ok.snap‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
---
22
source: crates/squawk_parser/tests/tests.rs
33
input_file: crates/squawk_parser/tests/data/ok/alter_conversion.sql
4-
snapshot_kind: text
54
---
65
SOURCE_FILE
76
COMMENT "-- rename"
87
WHITESPACE "\n"
9-
ALTER_CONVERSION_STMT
8+
ALTER_CONVERSION
109
ALTER_KW "alter"
1110
WHITESPACE " "
1211
CONVERSION_KW "conversion"
@@ -26,7 +25,7 @@ SOURCE_FILE
2625
WHITESPACE "\n\n"
2726
COMMENT "-- owner"
2827
WHITESPACE "\n"
29-
ALTER_CONVERSION_STMT
28+
ALTER_CONVERSION
3029
ALTER_KW "alter"
3130
WHITESPACE " "
3231
CONVERSION_KW "conversion"
@@ -43,7 +42,7 @@ SOURCE_FILE
4342
IDENT "u"
4443
SEMICOLON ";"
4544
WHITESPACE "\n"
46-
ALTER_CONVERSION_STMT
45+
ALTER_CONVERSION
4746
ALTER_KW "alter"
4847
WHITESPACE " "
4948
CONVERSION_KW "conversion"
@@ -62,7 +61,7 @@ SOURCE_FILE
6261
WHITESPACE "\n\n"
6362
COMMENT "-- set_schema"
6463
WHITESPACE "\n"
65-
ALTER_CONVERSION_STMT
64+
ALTER_CONVERSION
6665
ALTER_KW "alter"
6766
WHITESPACE " "
6867
CONVERSION_KW "conversion"
@@ -82,7 +81,7 @@ SOURCE_FILE
8281
WHITESPACE "\n\n"
8382
COMMENT "-- qualified_name"
8483
WHITESPACE "\n"
85-
ALTER_CONVERSION_STMT
84+
ALTER_CONVERSION
8685
ALTER_KW "alter"
8786
WHITESPACE " "
8887
CONVERSION_KW "conversion"

‎crates/squawk_parser/tests/snapshots/tests__alter_database_ok.snap‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
---
22
source: crates/squawk_parser/tests/tests.rs
33
input_file: crates/squawk_parser/tests/data/ok/alter_database.sql
4-
snapshot_kind: text
54
---
65
SOURCE_FILE
76
COMMENT "-- rename"
87
WHITESPACE "\n"
9-
ALTER_DATABASE_STMT
8+
ALTER_DATABASE
109
ALTER_KW "alter"
1110
WHITESPACE " "
1211
DATABASE_KW "database"
@@ -24,7 +23,7 @@ SOURCE_FILE
2423
WHITESPACE "\n\n"
2524
COMMENT "-- owner"
2625
WHITESPACE "\n"
27-
ALTER_DATABASE_STMT
26+
ALTER_DATABASE
2827
ALTER_KW "alter"
2928
WHITESPACE " "
3029
DATABASE_KW "database"
@@ -39,7 +38,7 @@ SOURCE_FILE
3938
IDENT "u"
4039
SEMICOLON ";"
4140
WHITESPACE "\n"
42-
ALTER_DATABASE_STMT
41+
ALTER_DATABASE
4342
ALTER_KW "alter"
4443
WHITESPACE " "
4544
DATABASE_KW "database"
@@ -56,7 +55,7 @@ SOURCE_FILE
5655
WHITESPACE "\n\n"
5756
COMMENT "-- tablespace"
5857
WHITESPACE "\n"
59-
ALTER_DATABASE_STMT
58+
ALTER_DATABASE
6059
ALTER_KW "alter"
6160
WHITESPACE " "
6261
DATABASE_KW "database"
@@ -74,7 +73,7 @@ SOURCE_FILE
7473
WHITESPACE "\n\n"
7574
COMMENT "-- refresh"
7675
WHITESPACE "\n"
77-
ALTER_DATABASE_STMT
76+
ALTER_DATABASE
7877
ALTER_KW "alter"
7978
WHITESPACE " "
8079
DATABASE_KW "database"
@@ -91,7 +90,7 @@ SOURCE_FILE
9190
WHITESPACE "\n\n"
9291
COMMENT "-- set_param"
9392
WHITESPACE "\n"
94-
ALTER_DATABASE_STMT
93+
ALTER_DATABASE
9594
ALTER_KW "alter"
9695
WHITESPACE " "
9796
DATABASE_KW "database"
@@ -111,7 +110,7 @@ SOURCE_FILE
111110
IDENT "v"
112111
SEMICOLON ";"
113112
WHITESPACE "\n"
114-
ALTER_DATABASE_STMT
113+
ALTER_DATABASE
115114
ALTER_KW "alter"
116115
WHITESPACE " "
117116
DATABASE_KW "database"
@@ -131,7 +130,7 @@ SOURCE_FILE
131130
IDENT "v"
132131
SEMICOLON ";"
133132
WHITESPACE "\n"
134-
ALTER_DATABASE_STMT
133+
ALTER_DATABASE
135134
ALTER_KW "alter"
136135
WHITESPACE " "
137136
DATABASE_KW "database"
@@ -151,7 +150,7 @@ SOURCE_FILE
151150
DEFAULT_KW "default"
152151
SEMICOLON ";"
153152
WHITESPACE "\n"
154-
ALTER_DATABASE_STMT
153+
ALTER_DATABASE
155154
ALTER_KW "alter"
156155
WHITESPACE " "
157156
DATABASE_KW "database"
@@ -173,7 +172,7 @@ SOURCE_FILE
173172
WHITESPACE "\n\n"
174173
COMMENT "-- reset"
175174
WHITESPACE "\n"
176-
ALTER_DATABASE_STMT
175+
ALTER_DATABASE
177176
ALTER_KW "alter"
178177
WHITESPACE " "
179178
DATABASE_KW "database"
@@ -189,7 +188,7 @@ SOURCE_FILE
189188
IDENT "p"
190189
SEMICOLON ";"
191190
WHITESPACE "\n"
192-
ALTER_DATABASE_STMT
191+
ALTER_DATABASE
193192
ALTER_KW "alter"
194193
WHITESPACE " "
195194
DATABASE_KW "database"
@@ -204,7 +203,7 @@ SOURCE_FILE
204203
WHITESPACE "\n\n"
205204
COMMENT "-- with_option"
206205
WHITESPACE "\n"
207-
ALTER_DATABASE_STMT
206+
ALTER_DATABASE
208207
ALTER_KW "alter"
209208
WHITESPACE " "
210209
DATABASE_KW "database"
@@ -222,7 +221,7 @@ SOURCE_FILE
222221
WHITESPACE "\n\n"
223222
COMMENT "-- option_connection_limit"
224223
WHITESPACE "\n"
225-
ALTER_DATABASE_STMT
224+
ALTER_DATABASE
226225
ALTER_KW "alter"
227226
WHITESPACE " "
228227
DATABASE_KW "database"
@@ -240,7 +239,7 @@ SOURCE_FILE
240239
WHITESPACE "\n\n"
241240
COMMENT "-- option_is_template"
242241
WHITESPACE "\n"
243-
ALTER_DATABASE_STMT
242+
ALTER_DATABASE
244243
ALTER_KW "alter"
245244
WHITESPACE " "
246245
DATABASE_KW "database"
@@ -256,7 +255,7 @@ SOURCE_FILE
256255
WHITESPACE "\n\n"
257256
COMMENT "-- with_multiple_options"
258257
WHITESPACE "\n"
259-
ALTER_DATABASE_STMT
258+
ALTER_DATABASE
260259
ALTER_KW "alter"
261260
WHITESPACE " "
262261
DATABASE_KW "database"

0 commit comments

Comments
 (0)