tree-sitter-ucode 0.1.2 → 0.2.0

package/README.md

@@ -17,13 +17,12 @@ Ucode is an ECMAScript subset with OpenWrt-specific extensions. Key differences:
 |---------|-------|------------|
 | Alternative block syntax | `if/elif/else/endif`, `for/endfor`, `while/endwhile`, `function/endfunction` | Not supported |
 | Two-variable for-in | `for (k, v in obj)` | Single variable only |
-| Forward declaration | `function foo;` | Not supported |
-| Removed keywords | `var`, `new`, `typeof`, `void`, `class`, `instanceof`, `do`, `async`, `await`, `yield` | All supported |
-| Removed features | Destructuring, `for...of`, `do-while`, generators | All supported |
+| Removed keywords | `var`, `new`, `throw`, `typeof`, `void`, `class`, `instanceof`, `do`, `async`, `await`, `yield` | All supported |
+| Removed features | Destructuring, `for...of`, `do-while`, generators, forward declarations, dynamic `import()` | All supported |
 | Added number literals | `0177` (C octal), `0x1.8` (hex float), `0B`/`0O` prefixes | Standard only |
 | Added escape sequences | `\e` (ESC), `\a` (BEL), octal `\177` | Standard only |
 | Regex flags | `g`, `i`, `s` only | Full set |
-| Module system | Static `import`/`export`, dynamic `import(path)`; no `from` on re-exports | Full ES modules |
+| Module system | Static `import`/`export` only; no `from` on re-exports | Full ES modules |
 
 ## Requirements
 

package/grammar.js

@@ -46,6 +46,7 @@ module.exports = grammar({
       'if',
       'import',
       'in',
+      'let',
       'null',
       'return',
       'switch',
@@ -99,7 +100,6 @@ module.exports = grammar({
     ['member', 'call', $.expression],
     ['declaration', 'literal'],
     [$.primary_expression, $.statement_block, 'object'],
-    [$.import_statement, $.import],
     [$.export_statement, $.primary_expression],
     [$.lexical_declaration, $.primary_expression],
   ],
@@ -143,7 +143,7 @@ module.exports = grammar({
             'default',
             seq(
               field('value', $.expression),
-              $._semicolon,
+              ';',
             ),
           ),
         ),
@@ -173,18 +173,14 @@ module.exports = grammar({
 
     declaration: $ => choice(
       $.function_declaration,
-      $.function_forward_declaration,
       $.lexical_declaration,
     ),
 
     //
     // Import declarations
     // Ucode keeps full ES module static import syntax.
-    // Also adds dynamic `import(path)` as a unary expression (see import_expression).
     //
 
-    import: _ => token('import'),
-
     import_statement: $ => seq(
       'import',
       choice(
@@ -461,7 +457,6 @@ module.exports = grammar({
       $.binary_expression,
       $.ternary_expression,
       $.update_expression,
-      $.import_expression,
     ),
 
     primary_expression: $ => choice(
@@ -485,14 +480,6 @@ module.exports = grammar({
       $.call_expression,
     ),
 
-    // Dynamic import expression: `let m = import("./mod.uc")`
-    import_expression: $ => prec('call', seq(
-      $.import,
-      '(',
-      field('source', $.expression),
-      ')',
-    )),
-
     object: $ => prec('object', seq(
       '{',
       commaSep(optional(choice(
@@ -662,13 +649,6 @@ module.exports = grammar({
       optional($._automatic_semicolon),
     )),
 
-    // Forward declaration: `function name;`
-    function_forward_declaration: $ => seq(
-      'function',
-      field('name', $.identifier),
-      ';',
-    ),
-
     arrow_function: $ => seq(
       choice(
         field('parameter', choice(
@@ -857,7 +837,6 @@ module.exports = grammar({
     _reserved_identifier: _ => choice(
       'get',
       'set',
-      'let',
     ),
 
     _semicolon: $ => choice($._automatic_semicolon, ';'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-ucode",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Ucode grammar for tree-sitter",
   "repository": {
     "type": "git",

package/queries/highlights.scm

@@ -53,9 +53,6 @@
 (function_declaration
   name: (identifier) @function)
 
-(function_forward_declaration
-  name: (identifier) @function)
-
 (function_expression
   name: (identifier) @function)
 
@@ -121,8 +118,6 @@
 
 ["import" "export"] @keyword.import
 ["as" "from"] @keyword.import
-; Dynamic import() uses a named node, not an anonymous string
-(import_expression (import) @keyword.import)
 
 ; -------------------------------------------------------------------------
 ; Keywords — storage / operators

package/queries/locals.scm

@@ -6,7 +6,6 @@
 ; -------------------------------------------------------------------------
 
 (function_declaration) @local.scope
-; function_forward_declaration has no body — it is a definition, not a scope
 (function_expression) @local.scope
 (arrow_function) @local.scope
 ; statement_block provides block scoping for let/const
@@ -23,16 +22,12 @@
 ; Definitions — functions
 ; -------------------------------------------------------------------------
 
-; Declaration and forward-declaration names belong to the *enclosing* scope
-; so that callers outside the function body can resolve them.
+; Function declaration names belong to the enclosing scope so that
+; callers outside the function body can resolve them.
 (function_declaration
   name: (identifier) @local.definition.function
   (#set! definition.function.scope parent))
 
-(function_forward_declaration
-  name: (identifier) @local.definition.function
-  (#set! definition.function.scope parent))
-
 ; Named function expressions (let f = function foo() {}) keep their name
 ; *inside* the expression scope — foo is only visible for self-recursion,
 ; not to the surrounding block.  No (#set! parent) here.

package/queries/tags.scm

@@ -14,19 +14,6 @@
   (#select-adjacent! @doc @definition.function)
 )
 
-; -------------------------------------------------------------------------
-; Function definitions — forward declarations: `function name;`
-; -------------------------------------------------------------------------
-
-(
-  (comment)* @doc
-  .
-  (function_forward_declaration
-    name: (identifier) @name) @definition.function
-  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
-  (#select-adjacent! @doc @definition.function)
-)
-
 ; -------------------------------------------------------------------------
 ; Function definitions — named function expressions
 ; -------------------------------------------------------------------------

package/src/grammar.json

@@ -88,8 +88,8 @@
                           }
                         },
                         {
-                          "type": "SYMBOL",
-                          "name": "_semicolon"
+                          "type": "STRING",
+                          "value": ";"
                         }
                       ]
                     }
@@ -221,23 +221,12 @@
           "type": "SYMBOL",
           "name": "function_declaration"
         },
-        {
-          "type": "SYMBOL",
-          "name": "function_forward_declaration"
-        },
         {
           "type": "SYMBOL",
           "name": "lexical_declaration"
         }
       ]
     },
-    "import": {
-      "type": "TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "import"
-      }
-    },
     "import_statement": {
       "type": "SEQ",
       "members": [
@@ -1690,10 +1679,6 @@
         {
           "type": "SYMBOL",
           "name": "update_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "import_expression"
         }
       ]
     },
@@ -1779,35 +1764,6 @@
         }
       ]
     },
-    "import_expression": {
-      "type": "PREC",
-      "value": "call",
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "SYMBOL",
-            "name": "import"
-          },
-          {
-            "type": "STRING",
-            "value": "("
-          },
-          {
-            "type": "FIELD",
-            "name": "source",
-            "content": {
-              "type": "SYMBOL",
-              "name": "expression"
-            }
-          },
-          {
-            "type": "STRING",
-            "value": ")"
-          }
-        ]
-      }
-    },
     "object": {
       "type": "PREC",
       "value": "object",
@@ -3472,27 +3428,6 @@
         ]
       }
     },
-    "function_forward_declaration": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "function"
-        },
-        {
-          "type": "FIELD",
-          "name": "name",
-          "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
-          }
-        },
-        {
-          "type": "STRING",
-          "value": ";"
-        }
-      ]
-    },
     "arrow_function": {
       "type": "SEQ",
       "members": [
@@ -4666,10 +4601,6 @@
         {
           "type": "STRING",
           "value": "set"
-        },
-        {
-          "type": "STRING",
-          "value": "let"
         }
       ]
     },
@@ -4842,16 +4773,6 @@
         "value": "object"
       }
     ],
-    [
-      {
-        "type": "SYMBOL",
-        "name": "import_statement"
-      },
-      {
-        "type": "SYMBOL",
-        "name": "import"
-      }
-    ],
     [
       {
         "type": "SYMBOL",
@@ -4984,6 +4905,10 @@
         "type": "STRING",
         "value": "in"
       },
+      {
+        "type": "STRING",
+        "value": "let"
+      },
       {
         "type": "STRING",
         "value": "null"

package/src/node-types.json

@@ -7,10 +7,6 @@
         "type": "function_declaration",
         "named": true
       },
-      {
-        "type": "function_forward_declaration",
-        "named": true
-      },
       {
         "type": "lexical_declaration",
         "named": true
@@ -33,10 +29,6 @@
         "type": "binary_expression",
         "named": true
       },
-      {
-        "type": "import_expression",
-        "named": true
-      },
       {
         "type": "primary_expression",
         "named": true
@@ -1229,22 +1221,6 @@
       }
     }
   },
-  {
-    "type": "function_forward_declaration",
-    "named": true,
-    "fields": {
-      "name": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "identifier",
-            "named": true
-          }
-        ]
-      }
-    }
-  },
   {
     "type": "if_alt_statement",
     "named": true,
@@ -1327,11 +1303,6 @@
       }
     }
   },
-  {
-    "type": "import",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "import_clause",
     "named": true,
@@ -1355,32 +1326,6 @@
       ]
     }
   },
-  {
-    "type": "import_expression",
-    "named": true,
-    "fields": {
-      "source": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "expression",
-            "named": true
-          }
-        ]
-      }
-    },
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "import",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "import_specifier",
     "named": true,