From 9e6a10c4596949a780102d98a27835baa2dffeb4 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Sat, 31 Jul 2021 20:44:34 -0500 Subject: [PATCH] Update tree-sitter-cli to 0.20.0 --- .github/workflows/ci.yaml | 2 +- Makefile | 10 +++++----- package-lock.json | 14 +++++++------- package.json | 7 ++++--- src/parser.c | 34 +++++++++++++++++----------------- src/tree_sitter/parser.h | 4 ++-- tree-sitter-comment.wasm | Bin 3898 -> 3837 bytes 7 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index daa8dbc..1a9f75b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 - run: echo ./node_modules/.bin/ >> $GITHUB_PATH - run: npm ci - run: make test diff --git a/Makefile b/Makefile index 5579a29..1d655c6 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ build: - tree-sitter generate + npm run build test: build - tree-sitter test + npm run test serve: build - tree-sitter build-wasm - tree-sitter web-ui + npm run wasm + npm run web release: build format - tree-sitter build-wasm + npm run wasm format: clang-format -i \ diff --git a/package-lock.json b/package-lock.json index fb2e0be..333e5ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "nan": "^2.14.2" }, "devDependencies": { - "tree-sitter-cli": "^0.19.4" + "tree-sitter-cli": "^0.20.0" } }, "node_modules/nan": { @@ -20,9 +20,9 @@ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, "node_modules/tree-sitter-cli": { - "version": "0.19.4", - "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.19.4.tgz", - "integrity": "sha512-p2kxjuoQeauXBu5eE+j7c5BMCRXmc17EiAswnnWn3ieUlHXBkA0Z7vRnaCSElDR34MhZnSgqgzuuzQk0cDqCjw==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.20.0.tgz", + "integrity": "sha512-4D1qapWbJXZ5rrSUGM5rcw5Vuq/smzn9KbiFRhlON6KeuuXjra+KAtDYVrDgAoLIG4ku+jbEEGrJxCptUGi3dg==", "dev": true, "hasInstallScript": true, "bin": { @@ -37,9 +37,9 @@ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, "tree-sitter-cli": { - "version": "0.19.4", - "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.19.4.tgz", - "integrity": "sha512-p2kxjuoQeauXBu5eE+j7c5BMCRXmc17EiAswnnWn3ieUlHXBkA0Z7vRnaCSElDR34MhZnSgqgzuuzQk0cDqCjw==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.20.0.tgz", + "integrity": "sha512-4D1qapWbJXZ5rrSUGM5rcw5Vuq/smzn9KbiFRhlON6KeuuXjra+KAtDYVrDgAoLIG4ku+jbEEGrJxCptUGi3dg==", "dev": true } } diff --git a/package.json b/package.json index 39aca36..b4ae3fb 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "scripts": { "test": "tree-sitter test", "build": "tree-sitter generate", - "wasm": "tree-sitter build-wasm", - "web": "tree-sitter web-ui" + "wasm": "tree-sitter build-wasm --docker", + "web": "tree-sitter web-ui", + "parse": "tree-sitter parse" }, "repository": { "type": "git", @@ -26,6 +27,6 @@ "nan": "^2.14.2" }, "devDependencies": { - "tree-sitter-cli": "^0.19.4" + "tree-sitter-cli": "^0.20.0" } } diff --git a/src/parser.c b/src/parser.c index 884d11c..2802e57 100644 --- a/src/parser.c +++ b/src/parser.c @@ -31,7 +31,7 @@ enum { aux_sym_source_repeat1 = 12, }; -static const char *ts_symbol_names[] = { +static const char * const ts_symbol_names[] = { [ts_builtin_sym_end] = "end", [anon_sym_COLON] = ":", [anon_sym_LPAREN] = "(", @@ -47,7 +47,7 @@ static const char *ts_symbol_names[] = { [aux_sym_source_repeat1] = "source_repeat1", }; -static TSSymbol ts_symbol_map[] = { +static const TSSymbol ts_symbol_map[] = { [ts_builtin_sym_end] = ts_builtin_sym_end, [anon_sym_COLON] = anon_sym_COLON, [anon_sym_LPAREN] = anon_sym_LPAREN, @@ -118,11 +118,11 @@ static const TSSymbolMetadata ts_symbol_metadata[] = { }, }; -static TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH] = { +static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH] = { [0] = {0}, }; -static uint16_t ts_non_terminal_alias_map[] = { +static const uint16_t ts_non_terminal_alias_map[] = { 0, }; @@ -192,7 +192,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { } } -static TSLexMode ts_lex_modes[STATE_COUNT] = { +static const TSLexMode ts_lex_modes[STATE_COUNT] = { [0] = {.lex_state = 0, .external_lex_state = 1}, [1] = {.lex_state = 0, .external_lex_state = 1}, [2] = {.lex_state = 0, .external_lex_state = 1}, @@ -212,19 +212,19 @@ enum { ts_external_token__text = 1, }; -static TSSymbol ts_external_scanner_symbol_map[EXTERNAL_TOKEN_COUNT] = { +static const TSSymbol ts_external_scanner_symbol_map[EXTERNAL_TOKEN_COUNT] = { [ts_external_token_name] = sym_name, [ts_external_token__text] = sym__text, }; -static bool ts_external_scanner_states[2][EXTERNAL_TOKEN_COUNT] = { +static const bool ts_external_scanner_states[2][EXTERNAL_TOKEN_COUNT] = { [1] = { [ts_external_token_name] = true, [ts_external_token__text] = true, }, }; -static uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { +static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { [0] = { [ts_builtin_sym_end] = ACTIONS(1), [anon_sym_COLON] = ACTIONS(1), @@ -265,7 +265,7 @@ static uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { }, }; -static uint16_t ts_small_parse_table[] = { +static const uint16_t ts_small_parse_table[] = { [0] = 4, ACTIONS(23), 1, anon_sym_COLON, @@ -324,7 +324,7 @@ static uint16_t ts_small_parse_table[] = { sym___whitespace, }; -static uint32_t ts_small_parse_table_map[] = { +static const uint32_t ts_small_parse_table_map[] = { [SMALL_STATE(4)] = 0, [SMALL_STATE(5)] = 14, [SMALL_STATE(6)] = 24, @@ -335,7 +335,7 @@ static uint32_t ts_small_parse_table_map[] = { [SMALL_STATE(11)] = 66, }; -static TSParseActionEntry ts_parse_actions[] = { +static const TSParseActionEntry ts_parse_actions[] = { [0] = {.entry = {.count = 0, .reusable = false}}, [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(), [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(), @@ -373,7 +373,7 @@ void tree_sitter_comment_external_scanner_deserialize(void *, const char *, unsi #endif extern const TSLanguage *tree_sitter_comment(void) { - static TSLanguage language = { + static const TSLanguage language = { .version = LANGUAGE_VERSION, .symbol_count = SYMBOL_COUNT, .alias_count = ALIAS_COUNT, @@ -384,19 +384,19 @@ extern const TSLanguage *tree_sitter_comment(void) { .production_id_count = PRODUCTION_ID_COUNT, .field_count = FIELD_COUNT, .max_alias_sequence_length = MAX_ALIAS_SEQUENCE_LENGTH, - .parse_table = (const uint16_t *)ts_parse_table, - .small_parse_table = (const uint16_t *)ts_small_parse_table, - .small_parse_table_map = (const uint32_t *)ts_small_parse_table_map, + .parse_table = &ts_parse_table[0][0], + .small_parse_table = ts_small_parse_table, + .small_parse_table_map = ts_small_parse_table_map, .parse_actions = ts_parse_actions, .symbol_names = ts_symbol_names, .symbol_metadata = ts_symbol_metadata, .public_symbol_map = ts_symbol_map, .alias_map = ts_non_terminal_alias_map, - .alias_sequences = (const TSSymbol *)ts_alias_sequences, + .alias_sequences = &ts_alias_sequences[0][0], .lex_modes = ts_lex_modes, .lex_fn = ts_lex, .external_scanner = { - (const bool *)ts_external_scanner_states, + &ts_external_scanner_states[0][0], ts_external_scanner_symbol_map, tree_sitter_comment_external_scanner_create, tree_sitter_comment_external_scanner_destroy, diff --git a/src/tree_sitter/parser.h b/src/tree_sitter/parser.h index a3a87bd..cbbc7b4 100644 --- a/src/tree_sitter/parser.h +++ b/src/tree_sitter/parser.h @@ -102,8 +102,8 @@ struct TSLanguage { const uint16_t *small_parse_table; const uint32_t *small_parse_table_map; const TSParseActionEntry *parse_actions; - const char **symbol_names; - const char **field_names; + const char * const *symbol_names; + const char * const *field_names; const TSFieldMapSlice *field_map_slices; const TSFieldMapEntry *field_map_entries; const TSSymbolMetadata *symbol_metadata; diff --git a/tree-sitter-comment.wasm b/tree-sitter-comment.wasm index bcddc23de21a6ee39b8bbf671d3dfeb4d7874ac0..52e3d56b30d5c2251d1b7e2fd43a98164b44b1d2 100755 GIT binary patch delta 1530 zcmaKsPiP!f9LIm}&&0tl&Y4mUvP`ND3ZG2^jPuisJXZ*|9nKmha5(^M1eg zeZP4R_VcIzerl3BgENdULigmmbEoHf8&wHrhrJn=v22EC86hGQ0EuQqRzz!)7ufS= zC5CW>%SFX;h3leNldAkA#_H|%BJA6R8?C@-Vu>L#yo@IXqW0E4KZVEa`dfDsZ zxl7#_xxtGTx7i3+EG~%=UbT2zj&QZeR!8`m#g(%73yYg2-nRHaWTWb@E$@`+Z!9jA z*53kI(bA7LbG^*`Y;mK+Z6GfSe?cgU@IFFWggXeGBHTsjW<|VIHQ#-wGV11ii+4*r zZ}DD(|)feIb)nuOvgg@n9`Im6*F~&aZ|~8Q#21! ze!)3Zs~Mm179LyF>gQEA_Pi;Htd8MNaznP)!jV`PNsSe{G4({q z^B>&Cei@*DOteBmq#Fr0_K^%lK3;h<6Dk(_j4jg?`RY8wiSVZBgrO5e*p3dc$eQCs z0BhR*Lh+E<~4%?$wXZCFu!%CSx_T1lo(cM~HYgi2T7VoO661WLOJ3w+bJc$vwf6La{Q zCC+H^bXWs_wJIv=08`xS!MXEQ5)6# zBY$rFJ$00={}%kgP7Kp`hSWYcNc%MGoT7GnK3&9rVoLL!Gbs(up6k!1m|cA9^e`PP zbO7o6NtzsG+WmAP?F?U_!_=UMBmc{PwzUA>hL#vnljAKP7MN%S^PA8EXa^$H>>U%} pqdeE)SpG&ROTC1WJA&vgbPu`=Z9&(dThJP`4BddPK$oCR=wBye1-t+N delta 1617 zcmZ{lPiP!f9LIm}_ukCT&YMXlMx|-d&ZZW&he`svU_{t=$i_vXUc}>Ov4hQSx?Qsq zqNi!WiYp2=t)<=|ZTHfpcA9MdD!vxkr{Sc6Na*hnj?s@f zkDVHRBnsYR{@C&diujWuyTt33*V%r3=+Au9@)d{pmgQ~c+m?5jcP;Naovem;_#kR{ z*BZ}r@*gd~$9$g|Yxsb7S;IZvRSkdR-KpW9yt_4g$UB((9>uJyf*&wnxBLt9mgPO> z9cCKP?|k^ezW9UrrsWG|;#-z4GT*kGGw)iy#C*r{W#+qk* z+|)kvOxO4?H}!J@vl!-8-H355>#>+dBRbQ<$OTnD2C*=hcB)7b3!%_DMuScLJOvq1 zL99#iF;OS~#yLJUB?Maq#c+Y|p+V1+jg=$$D{kz0MLrYfv#!bN-Tz2D)^uVj@g-7r ztYbX}syi(soDZpwlK{NauN2$82?3IP_PsDddWn%Np6)#LdeAk-iVV2@A~=|x0ElJe zhJrKvo5N9cx?pvIYG9;}gpvkAK-0-L+{g2yCH<@jkcUuhgaz?{MC6ZaQ>~!&rW}u~ z6gHW^Q8F0^jdOXLP2}qj1NaSbpsU{V~E2ul`OiHQHic6BQFFh#V0II zIC9nD)Et_YraKq!a^HJGKpuNqAZ1LsDnTow;}?+X!Av(Y$pMIpP;0TpoCz=sJ+a-IBIj)mdOz#MXO=;W~hR~ z<$pa+k%#0YY9t4LY%tEKt(d7hVk=tB5Bb%p&&z`T4(P2i(DF$k1FgL2FXu0eRU04x z`lJX+5@3e*gR4*HE2M4G4r!M(vM5H$d}Hj%&CmQ9@zNOuuuSTa`lMCT8tDS*A}J?b zB3&k3C0!#uTAM%Vzr<@v?=;Lo6;=ny3Y>setCy_Nzkq~j?aWe|4EpUi6X>kkF&cZ*5$^BOV