Skip to content

Commit acf2b6b

Browse files
kristoff-itkristoff-it
committed
update ziggy treesitter grammar
1 parent 2a69c3f commit acf2b6b

File tree

3 files changed

+24
-37
lines changed

3 files changed

+24
-37
lines changed

‎tree-sitter-ziggy/src/grammar.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,4 +1355,3 @@
13551355
"inline": [],
13561356
"supertypes": []
13571357
}
1358-

‎tree-sitter-ziggy/src/parser.c‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define MAX_ALIAS_SEQUENCE_LENGTH 7
1717
#define PRODUCTION_ID_COUNT 6
1818

19-
enum {
19+
enum ts_symbol_identifiers {
2020
anon_sym_COMMA = 1,
2121
anon_sym_LBRACE = 2,
2222
anon_sym_RBRACE = 3,
@@ -496,7 +496,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
496496
},
497497
};
498498

499-
enum {
499+
enum ts_field_identifiers {
500500
field_key = 1,
501501
field_name = 2,
502502
field_value = 3,
@@ -698,9 +698,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
698698
if (lookahead == 'n' ||
699699
lookahead == 'r' ||
700700
lookahead == 't') ADVANCE(46);
701-
if (lookahead == '\t' ||
702-
lookahead == '\n' ||
703-
lookahead == '\r' ||
701+
if (('\t' <= lookahead && lookahead <= '\r') ||
704702
lookahead == ' ') SKIP(0)
705703
if (('0' <= lookahead && lookahead <= '9') ||
706704
lookahead == '_') ADVANCE(46);
@@ -714,17 +712,13 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
714712
case 2:
715713
if (lookahead == '"') ADVANCE(60);
716714
if (lookahead == '\\') ADVANCE(63);
717-
if (lookahead == '\t' ||
718-
lookahead == '\n' ||
719-
lookahead == '\r' ||
715+
if (('\t' <= lookahead && lookahead <= '\r') ||
720716
lookahead == ' ') ADVANCE(61);
721717
if (lookahead != 0) ADVANCE(62);
722718
END_STATE();
723719
case 3:
724720
if (lookahead == '(') ADVANCE(53);
725-
if (lookahead == '\t' ||
726-
lookahead == '\n' ||
727-
lookahead == '\r' ||
721+
if (('\t' <= lookahead && lookahead <= '\r') ||
728722
lookahead == ' ') SKIP(3)
729723
if (('0' <= lookahead && lookahead <= '9') ||
730724
lookahead == '_' ||
@@ -770,25 +764,21 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
770764
case 16:
771765
if (lookahead == 'u') ADVANCE(19);
772766
if (lookahead == 'x') ADVANCE(39);
773-
if (lookahead == '\t' ||
774-
lookahead == '\n' ||
775-
lookahead == '\r' ||
776-
lookahead == ' ') SKIP(16)
777767
if (lookahead == '"' ||
778768
lookahead == '\'' ||
779769
lookahead == '\\' ||
780770
lookahead == 'n' ||
781771
lookahead == 'r' ||
782772
lookahead == 't') ADVANCE(66);
773+
if (('\t' <= lookahead && lookahead <= '\r') ||
774+
lookahead == ' ') SKIP(16)
783775
END_STATE();
784776
case 17:
785777
if (lookahead == 'u') ADVANCE(12);
786778
END_STATE();
787779
case 18:
788780
if (lookahead == '{') ADVANCE(43);
789-
if (lookahead == '\t' ||
790-
lookahead == '\n' ||
791-
lookahead == '\r' ||
781+
if (('\t' <= lookahead && lookahead <= '\r') ||
792782
lookahead == ' ') SKIP(18)
793783
if (('0' <= lookahead && lookahead <= '9') ||
794784
('A' <= lookahead && lookahead <= 'Z') ||
@@ -829,16 +819,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
829819
lookahead == '1') ADVANCE(74);
830820
END_STATE();
831821
case 26:
832-
if (lookahead == '\t' ||
833-
lookahead == '\n' ||
834-
lookahead == '\r' ||
822+
if (('\t' <= lookahead && lookahead <= '\r') ||
835823
lookahead == ' ') SKIP(26)
836824
if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(55);
837825
END_STATE();
838826
case 27:
839-
if (lookahead == '\t' ||
840-
lookahead == '\n' ||
841-
lookahead == '\r' ||
827+
if (('\t' <= lookahead && lookahead <= '\r') ||
842828
lookahead == ' ') SKIP(27)
843829
if (('A' <= lookahead && lookahead <= 'Z') ||
844830
lookahead == '_' ||
@@ -906,9 +892,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
906892
if (lookahead == 't') ADVANCE(13);
907893
if (lookahead == '{') ADVANCE(43);
908894
if (lookahead == '}') ADVANCE(44);
909-
if (lookahead == '\t' ||
910-
lookahead == '\n' ||
911-
lookahead == '\r' ||
895+
if (('\t' <= lookahead && lookahead <= '\r') ||
912896
lookahead == ' ') SKIP(40)
913897
if (('1' <= lookahead && lookahead <= '9')) ADVANCE(78);
914898
if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(45);
@@ -967,7 +951,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
967951
case 58:
968952
ACCEPT_TOKEN(aux_sym_line_string_token1);
969953
if (lookahead == '\t' ||
970-
lookahead == '\r' ||
954+
(11 <= lookahead && lookahead <= '\r') ||
971955
lookahead == ' ') ADVANCE(58);
972956
if (lookahead != 0 &&
973957
lookahead != '\n') ADVANCE(59);
@@ -982,9 +966,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
982966
END_STATE();
983967
case 61:
984968
ACCEPT_TOKEN(aux_sym_quoted_string_token1);
985-
if (lookahead == '\t' ||
986-
lookahead == '\n' ||
987-
lookahead == '\r' ||
969+
if (('\t' <= lookahead && lookahead <= '\r') ||
988970
lookahead == ' ') ADVANCE(61);
989971
if (lookahead != 0 &&
990972
lookahead != '"' &&

‎tree-sitter-ziggy/src/tree_sitter/parser.h‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ extern "C" {
1313
#define ts_builtin_sym_end 0
1414
#define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024
1515

16-
typedef uint16_t TSStateId;
17-
1816
#ifndef TREE_SITTER_API_H_
17+
typedef uint16_t TSStateId;
1918
typedef uint16_t TSSymbol;
2019
typedef uint16_t TSFieldId;
2120
typedef struct TSLanguage TSLanguage;
@@ -130,9 +129,16 @@ struct TSLanguage {
130129
* Lexer Macros
131130
*/
132131

132+
#ifdef _MSC_VER
133+
#define UNUSED __pragma(warning(suppress : 4101))
134+
#else
135+
#define UNUSED __attribute__((unused))
136+
#endif
137+
133138
#define START_LEXER() \
134139
bool result = false; \
135140
bool skip = false; \
141+
UNUSED \
136142
bool eof = false; \
137143
int32_t lookahead; \
138144
goto start; \
@@ -166,7 +172,7 @@ struct TSLanguage {
166172
* Parse Table Macros
167173
*/
168174

169-
#define SMALL_STATE(id) id - LARGE_STATE_COUNT
175+
#define SMALL_STATE(id) ((id) - LARGE_STATE_COUNT)
170176

171177
#define STATE(id) id
172178

@@ -176,15 +182,15 @@ struct TSLanguage {
176182
{{ \
177183
.shift = { \
178184
.type = TSParseActionTypeShift, \
179-
.state = state_value \
185+
.state = (state_value) \
180186
} \
181187
}}
182188

183189
#define SHIFT_REPEAT(state_value) \
184190
{{ \
185191
.shift = { \
186192
.type = TSParseActionTypeShift, \
187-
.state = state_value, \
193+
.state = (state_value), \
188194
.repetition = true \
189195
} \
190196
}}

0 commit comments

Comments
 (0)