Skip to content

Commit 261b202

Browse files
Raw reference/identifier conflict (#288)
* Raw reference/identifier conflict * Added test * Regenerate with cli v0.25.10 * Upgrade tree-sitter dependency on node bindings * Upgrade tree-sitter dependency for Swift * Unsafe foreign_mod_item and CI updates
1 parent 946595d commit 261b202

File tree

12 files changed

+139521
-137923
lines changed

12 files changed

+139521
-137923
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,7 @@ jobs:
5252
- name: Parse examples
5353
uses: tree-sitter/parse-action@v4
5454
with:
55-
files: examples/**/*.rs
55+
files: |
56+
examples/**/*.rs
57+
!examples/libc/ctest/templates/test.rs
58+
!examples/libc/ctest/tests/input/invalid_syntax.rs

Package.resolved

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

Package.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

grammar.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ module.exports = grammar({
110110
[$.array_expression],
111111
[$.visibility_modifier],
112112
[$.visibility_modifier, $.scoped_identifier, $.scoped_type_identifier],
113+
[$.foreign_mod_item, $.function_modifiers],
113114
],
114115

115116
word: $ => $.identifier,
@@ -279,7 +280,7 @@ module.exports = grammar({
279280
),
280281

281282
foreign_mod_item: $ => seq(
282-
optional($.visibility_modifier),
283+
optional('unsafe'),
283284
$.extern_modifier,
284285
choice(
285286
';',
@@ -1651,6 +1652,7 @@ module.exports = grammar({
16511652
'default',
16521653
'union',
16531654
'gen',
1655+
'raw',
16541656
), $.identifier),
16551657

16561658
_type_identifier: $ => alias($.identifier, $.type_identifier),

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/grammar.json

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

src/node-types.json

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

0 commit comments

Comments
 (0)