fix: FunC identifiers recognition now matches actual grammar rules of…

… FunC
tact-lang · Aug 10, 2024 · 9a7d4f7 · 9a7d4f7
1 parent 497f045
commit 9a7d4f7
Show file tree

Hide file tree

Showing 3 changed files with 3,717 additions and 3,740 deletions.
diff --git a/grammar.js b/grammar.js
@@ -704,11 +704,9 @@ module.exports = grammar({
 
     /* Identifiers */
 
-    func_identifier: ($) =>
-      seq($._func_identifier_letter, repeat($._func_identifier_part)),
-
-    _func_identifier_part: ($) => choice($._func_identifier_letter, /[0-9]/),
-    _func_identifier_letter: (_) => choice(/[a-zA-Z_'?!&]/, /::/),
+    func_identifier: ($) => choice($._func_plain_id, $._func_quoted_id),
+    _func_quoted_id: (_) => /[\.\~]?\`[^\n\`]+\`/,
+    _func_plain_id: (_) => /[\.\~]?[^\s\(\)\[\]\,\.\;\~]+/,
 
     identifier: (_) => /[a-zA-Z_][a-zA-Z0-9_]*/,
 

diff --git a/src/grammar.json b/src/grammar.json