Skip to content

Commit 21d7b71

Browse files
authored
Revert "Use reserved keywords (#49)" (#52)
This reverts commit 235f530.
1 parent 224e64b commit 21d7b71

File tree

7 files changed

+1589436
-1478744
lines changed

7 files changed

+1589436
-1478744
lines changed

Cargo.lock

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

grammar.js

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -245,41 +245,6 @@ module.exports = grammar({
245245

246246
word: $ => $._alpha_identifier,
247247

248-
// See: https://kotlinlang.org/docs/keyword-reference.html#hard-keywords
249-
reserved: {
250-
global: $ => [
251-
"as",
252-
"break",
253-
"class",
254-
"continue",
255-
"do",
256-
"else",
257-
"false",
258-
"for",
259-
"fun",
260-
"if",
261-
"in",
262-
"interface",
263-
"is",
264-
"null",
265-
"object",
266-
"package",
267-
"return",
268-
"super",
269-
"this",
270-
"throw",
271-
"true",
272-
"try",
273-
"typealias",
274-
// This keyword fails parser generation:
275-
// "typeof",
276-
"val",
277-
"var",
278-
"when",
279-
"while",
280-
],
281-
},
282-
283248
rules: {
284249
// ====================
285250
// Syntax grammar
@@ -850,6 +815,14 @@ module.exports = grammar({
850815
field("right", $.expression)
851816
)),
852817

818+
// _directly_assignable_expression: $ => choice(
819+
// $.dot_qualified_expression,
820+
// $.index_access_expression,
821+
// $.simple_identifier,
822+
// $.postfix_expression,
823+
// $.this_expression
824+
// ),
825+
853826
// ==========
854827
// Expressions
855828
// ==========
@@ -1220,7 +1193,7 @@ module.exports = grammar({
12201193

12211194
_interpolation: $ => choice(
12221195
seq("${", repeat($._NL), alias($.expression, $.interpolated_expression), repeat($._NL), "}"),
1223-
seq("$", choice(alias("this", $.this_expression), alias($.simple_identifier, $.interpolated_identifier)))
1196+
seq("$", alias($.simple_identifier, $.interpolated_identifier))
12241197
),
12251198

12261199
lambda_literal: $ => prec(-1, seq(

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
"node-gyp-build": "^4.8.0"
4040
},
4141
"peerDependencies": {
42-
"tree-sitter": "^0.25.2"
42+
"tree-sitter": "^0.24.0"
4343
},
4444
"peerDependenciesMeta": {
4545
"tree_sitter": {
4646
"optional": true
4747
}
4848
},
4949
"devDependencies": {
50-
"tree-sitter-cli": "^0.25.2",
50+
"tree-sitter-cli": "^0.24.0",
5151
"prebuildify": "^6.0.0"
5252
}
5353
}

0 commit comments

Comments
 (0)