tree-sitter-objectscript 1.10.0 → 1.10.1

package/common/scanner.h

@@ -314,6 +314,93 @@ static bool is_statement_or_class_keyword(const int32_t *text, uint32_t len) {
   return false;
 }
 
+// Consumes an ObjectScript interpolation (#(...)# or ##(...)##) embedded in
+// &html/&xml text. Assumes lookahead is '#'. Inside the parens, '>' and '\''
+// are ObjectScript operators, not XML syntax, so they must not be treated as
+// tag ends or attribute quotes.
+static void skip_cos_interpolation(TSLexer *lexer) {
+  advance(lexer);
+  if (lexer->lookahead == '#') {
+    advance(lexer);
+  }
+  if (lexer->lookahead != '(') {
+    return;
+  }
+  int depth = 0;
+  while (!lexer->eof(lexer) && lexer->lookahead != '\n') {
+    int32_t c = lexer->lookahead;
+    if (c == '"') {
+      advance(lexer);
+      while (!lexer->eof(lexer) && lexer->lookahead != '\n') {
+        if (lexer->lookahead == '"') {
+          advance(lexer);
+          if (lexer->lookahead != '"') {
+            break;
+          }
+        }
+        advance(lexer);
+      }
+      continue;
+    }
+    advance(lexer);
+    if (c == '(') {
+      depth++;
+    } else if (c == ')') {
+      depth--;
+      if (depth == 0) {
+        break;
+      }
+    }
+  }
+  // consume the closing # (or ##)
+  if (lexer->lookahead == '#') {
+    advance(lexer);
+    if (lexer->lookahead == '#') {
+      advance(lexer);
+    }
+  }
+}
+
+// Consumes the rest of an XML tag up to (not including) the closing '>'.
+// A quote only opens an attribute value directly after '=', so stray quotes in
+// hand-written HTML (e.g. height=24") don't swallow the rest of the file.
+static void skip_xml_tag_body(TSLexer *lexer) {
+  int32_t prev = 0;
+  while (!lexer->eof(lexer) && lexer->lookahead != '>') {
+    int32_t c = lexer->lookahead;
+    if (c == '#') {
+      skip_cos_interpolation(lexer);
+      prev = '#';
+      continue;
+    }
+    if ((c == '"' || c == '\'') && prev == '=') {
+      advance(lexer);
+      while (!lexer->eof(lexer)) {
+        if (lexer->lookahead == '#') {
+          skip_cos_interpolation(lexer);
+          continue;
+        }
+        if (lexer->lookahead == c) {
+          advance(lexer);
+          if (lexer->lookahead == c) {
+            advance(lexer);
+          } else {
+            break;
+          }
+        } else {
+          advance(lexer);
+        }
+      }
+      prev = c;
+      continue;
+    }
+    if (!iswspace(c)) {
+      prev = c;
+    }
+    advance(lexer);
+  }
+}
+
 static bool lex_fenced_text(TSLexer *lexer,
                             enum ObjectScript_Core_Scanner_TokenType desired_symbol, int32_t l_delim,
                             int32_t r_delim, bool is_xml, bool has_python_comment, bool is_text) {
@@ -338,6 +425,10 @@ static bool lex_fenced_text(TSLexer *lexer,
         advance(lexer);
     }
     int32_t c = lexer->lookahead;
+    if (c == '#' && is_xml) {
+        skip_cos_interpolation(lexer);
+        continue;
+    }
     if (c == '<' && is_xml) {
         bool comment = true;
         bool is_code = false;
@@ -417,27 +508,7 @@ static bool lex_fenced_text(TSLexer *lexer,
                 }
                 advance(lexer);
             }
-            while (!lexer->eof(lexer) && lexer->lookahead != '>') {
-                if (lexer->lookahead == '"' || lexer->lookahead == '\'') {
-                  int32_t quote = lexer->lookahead;
-                  advance(lexer);
-                  while (!lexer->eof(lexer)) {
-                    if (lexer->lookahead == quote) {
-                      advance(lexer);
-                      if (lexer->lookahead == quote) {
-                        advance(lexer);
-                      } else {
-                        break;
-                      }
-                    } else {
-                      advance(lexer);
-                    }
-                  }
-                  continue;
-                }
-                advance(lexer);
-                continue;
-            }
+            skip_xml_tag_body(lexer);
             if (lexer->lookahead == '>') {
                 advance(lexer);
             }
@@ -470,27 +541,7 @@ static bool lex_fenced_text(TSLexer *lexer,
         }
 
         else {
-            while (!lexer->eof(lexer) && lexer->lookahead != '>') {
-                if (lexer->lookahead == '"' || lexer->lookahead == '\'') {
-                  int32_t quote = lexer->lookahead;
-                  advance(lexer);
-                  while (!lexer->eof(lexer)) {
-                     if (lexer->lookahead == quote) {
-                      advance(lexer);
-                      if (lexer->lookahead == quote) {
-                        advance(lexer);
-                      } else {
-                        break;
-                      }
-                    } else {
-                      advance(lexer);
-                    }
-                  }
-                  continue;
-                }
-                advance(lexer);
-                continue;
-            }
+            skip_xml_tag_body(lexer);
             // consume the >
             advance(lexer);
             continue;

package/core/grammar.js

@@ -895,8 +895,14 @@ module.exports = grammar(objectscript_expr, {
           $.expression,
         ),
       ),
+    // #dim is a compile-time declaration, so IRIS allows it between the
+    // try block and its catch.
     command_trycatch: ($) =>
-      seq(build_block_no_params($, $.keyword_try), $.catch_block),
+      seq(
+        build_block_no_params($, $.keyword_try),
+        repeat($.pound_dim),
+        $.catch_block,
+      ),
 
     catch_block: ($) =>
       build_block($, $.keyword_catch, build_arguments($._target_var_arg)),

package/core/src/node-types.json

@@ -1161,6 +1161,10 @@
           "type": "post_conditional",
           "named": true
         },
+        {
+          "type": "pound_dim",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true

package/core/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/core/src/parser.c
-size: 44969497 bytes
-sha256: 31a7ec2e09c196851d2c99357f2d680af6ca843c9467dbf2f15971bbfbda0edb
+size: 45411547 bytes
+sha256: db4d938f4fa0731c1a1a4e9b3e4e6c15467fc1f895e5dcc2071fbe0351465e6b

package/expr/src/parser.c

@@ -33694,7 +33694,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_expr(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 10,
-      .patch_version = 0,
+      .patch_version = 1,
     },
   };
   return &language;

package/objectscript/src/node-types.json

@@ -1474,6 +1474,10 @@
           "type": "post_conditional",
           "named": true
         },
+        {
+          "type": "pound_dim",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true

package/objectscript/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/objectscript/src/parser.c
-size: 49099514 bytes
-sha256: ef544d88aa14dd27a6e26cf33ea5a7cceace0eb146e077640f8a3a87c75a2d06
+size: 49565916 bytes
+sha256: 1477442aa6f499032e78b84a203442a42194c19a9ba6ef513ef33ff09f1684ac

package/objectscript_routine/src/node-types.json

@@ -1161,6 +1161,10 @@
           "type": "post_conditional",
           "named": true
         },
+        {
+          "type": "pound_dim",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true

package/objectscript_routine/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/objectscript_routine/src/parser.c
-size: 46784183 bytes
-sha256: 9dd9e7aae005c7dbb78b045be12ff724b5bea9fde29f5b77d5661b1b7b93d7a6
+size: 47254665 bytes
+sha256: b7879a42a5500d374086379c9741fb492fe93f691fde422c7fba1a59dd88e11c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-objectscript",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Tree Sitter Grammar for InterSystems ObjectScript",
   "scripts": {
     "install": "node-gyp-build",

package/prebuilds/darwin-arm64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/darwin-arm64/tree-sitter-objectscript.node
-size: 40728328 bytes
-sha256: 18998c4659f039ec76e94c84b8701d527a9e89b641a28daa87a4e1d62d1bd304
+size: 41043864 bytes
+sha256: 7839d20691e35e63516e080214c9ea27c0e40654c4ed3891489d18c67fc145ec

package/prebuilds/darwin-x64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/darwin-x64/tree-sitter-objectscript.node
-size: 40139016 bytes
-sha256: ce87db65a61be3cc9a65d7124c704c3b620e958250cda6cdf3cf80fa7c57eb86
+size: 40456208 bytes
+sha256: 81cd29cee7991cda725d8e44355d2d2468eef04d5c5e8c75f2a34c9ff43e4125

package/prebuilds/linux-arm64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/linux-arm64/tree-sitter-objectscript.node
-size: 40275880 bytes
-sha256: 57e9a731db64d6cc2166bd80511f36840947fc70bc66ad69b2139e85b9613b62
+size: 40604384 bytes
+sha256: ab70cb04db08b786f00f1069668b531a4eac9e52aec4ca3f521119bc370ef7b9

package/prebuilds/linux-x64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/linux-x64/tree-sitter-objectscript.node
-size: 40211944 bytes
-sha256: e776787360c5d7acfc0c65800ed2cbe3026495ba80d47b0d94e95484151c2460
+size: 40528160 bytes
+sha256: c55db79d2ee69f7aad878f20e2ead98771032f0a6317c2a9f825123faa89f49c

package/prebuilds/win32-arm64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/win32-arm64/tree-sitter-objectscript.node
-size: 40279040 bytes
-sha256: 6c47d4f85353850a66ff2a123987666060e906646c6995f41e5599549375fb83
+size: 40595456 bytes
+sha256: 3da2098b3ac836ebd541feb5d6d203d4387b2d26a52f0c804ddb019eb969c03e

package/prebuilds/win32-x64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/win32-x64/tree-sitter-objectscript.node
-size: 40199168 bytes
-sha256: cc24caf5b5238fb7963a7f3f1e71b62c380c5903af4b1e8d45de069001b3e941
+size: 40524288 bytes
+sha256: 63e3c8d9bfc8757dbcfa8b342bc2053843481c9afc01881e59e968751a57acca

package/tree-sitter.json

@@ -56,7 +56,7 @@
     }
   ],
   "metadata": {
-    "version": "1.10.0",
+    "version": "1.10.1",
     "license": "MIT",
     "description": "ObjectScript grammars for tree-sitter",
     "namespace": "io.github.treesitter.objectscript",

package/udl/queries/injections.scm

@@ -207,4 +207,9 @@
 ] @injection.content
   (#set! injection.language "comment"))
 
+(clientmethod
+  (external_method_body_content) @injection.content
+  (#set! injection.language "javascript")
+  (#set! injection.include-children "true"))
+
 ; === END LOCAL ===

package/udl/src/node-types.json

@@ -1474,6 +1474,10 @@
           "type": "post_conditional",
           "named": true
         },
+        {
+          "type": "pound_dim",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true

package/udl/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/udl/src/parser.c
-size: 47332276 bytes
-sha256: b0cc39f6503259485503203e9e7fb8bd32c8d52c741a8c3d4bdb796751984008
+size: 47804615 bytes
+sha256: 83eae6b661d54fbce616dadbeff92c1e1f38a0ee0a5129dd1beb780a20346c4b