tree-sitter-objectscript 1.9.14 → 1.9.16

package/common/scanner.h

@@ -177,6 +177,9 @@ struct ObjectScript_Core_Scanner {
   int32_t js_marker_buffer_reversed[MARKER_BUFFER_MAX_LEN];
   int js_marker_buffer_reversed_len;
   bool is_rtn_dot;
+  // Allows nested old-style commands to close before the same `. }` line
+  // is emitted as a dotted block end.
+  bool pending_dotted_block_end;
 };
 
 static inline bool is_label_char(int32_t c) {
@@ -542,6 +545,15 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
   if (valid_symbols[SENTINEL]) {
     return false;
   }
+
+  if (scanner->pending_dotted_block_end) {
+    if (lexer->lookahead == '.' && valid_symbols[_TERMINATION]) {
+      lexer->mark_end(lexer);
+      lexer->result_symbol = _TERMINATION;
+      return true;
+    }
+    scanner->pending_dotted_block_end = false;
+  }
   scanner-> is_rtn_dot = false;
 
   // this parses any line that ends in ##continue for
@@ -1099,11 +1111,18 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
               advance(lexer);
           }
           if (lexer->lookahead == '}') {
+              if (valid_symbols[_TERMINATION]) {
+                  scanner->pending_dotted_block_end = true;
+                  lexer->result_symbol = _TERMINATION;
+                  return true;
+              }
               lexer->result_symbol = _BOL_BLOCK;
+              scanner->pending_dotted_block_end = false;
               scanner->terminated_newline = false;
               return true;
           }
           lexer->result_symbol = _BOL;
+          scanner->pending_dotted_block_end = false;
           scanner->terminated_newline = false;
           return true;
       }
@@ -1112,9 +1131,10 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
         while (lexer->lookahead == ' ' || lexer->lookahead == '\t') advance(lexer);
 
         if (lexer->lookahead == '.') {
-          lexer->result_symbol = _BOL;
-          scanner->terminated_newline = false;
-          return true;
+              lexer->result_symbol = _BOL;
+              scanner->pending_dotted_block_end = false;
+              scanner->terminated_newline = false;
+              return true;
         }
         else {
           lexer->mark_end(lexer);
@@ -1342,6 +1362,7 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
     }
     lexer->mark_end(lexer);
     lexer->result_symbol = BOL_EXTRA;
+    scanner->pending_dotted_block_end = false;
     scanner->terminated_newline = false;
     return true;
   }
@@ -1361,4 +1382,5 @@ static void ObjectScript_Core_Scanner_init(struct ObjectScript_Core_Scanner *sca
   scanner->special_pound_if_mode = false;
   scanner->special_pound_if_mode_if_depth = 0;
   scanner->is_rtn_dot = false;
+  scanner->pending_dotted_block_end = false;
 }

package/core/src/parser.c

@@ -16416,9 +16416,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         'O', 1403,
       );
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1407);
+          lookahead != '\n') ADVANCE(1407);
       END_STATE();
     case 1:
       ADVANCE_MAP(
@@ -19144,9 +19142,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '\n' &&
           lookahead != '*' &&
           lookahead != ':' &&
-          lookahead != ';' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1407);
+          lookahead != ';') ADVANCE(1407);
       END_STATE();
     case 53:
       ADVANCE_MAP(
@@ -19171,9 +19167,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(1514);
       if (lookahead == '\\') ADVANCE(249);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(54);
+          lookahead != '\n') ADVANCE(54);
       END_STATE();
     case 55:
       ADVANCE_MAP(
@@ -19334,9 +19328,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 60:
       if (lookahead == '"') ADVANCE(1511);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(60);
+      if (lookahead != 0) ADVANCE(60);
       END_STATE();
     case 61:
       ADVANCE_MAP(
@@ -19435,25 +19427,19 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(1240);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(74);
+          lookahead != '\r') ADVANCE(74);
       END_STATE();
     case 75:
       if (lookahead == '"') ADVANCE(78);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(75);
+          lookahead != '\r') ADVANCE(75);
       END_STATE();
     case 76:
       if (lookahead == '"') ADVANCE(89);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(76);
+          lookahead != '\r') ADVANCE(76);
       END_STATE();
     case 77:
       if (lookahead == '"') ADVANCE(1418);
@@ -19514,9 +19500,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(84);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(83);
+          lookahead != '\r') ADVANCE(83);
       END_STATE();
     case 84:
       if (lookahead == '"') ADVANCE(83);
@@ -28855,9 +28839,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(1514);
       if (lookahead == '\\') ADVANCE(249);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(54);
+          lookahead != '\n') ADVANCE(54);
       END_STATE();
     case 1407:
       ACCEPT_TOKEN(aux_sym_sql_field_identifier_token2);
@@ -28890,42 +28872,32 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '#') ADVANCE(1415);
       if (lookahead == '/') ADVANCE(1416);
       if (lookahead == ';') ADVANCE(1526);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1415:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(77);
       if (lookahead == '#') ADVANCE(1417);
       if (lookahead == ';') ADVANCE(1523);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1416:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(77);
       if (lookahead == '*') ADVANCE(1532);
       if (lookahead == '/') ADVANCE(1520);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1417:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(77);
       if (lookahead == ';') ADVANCE(1529);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1418:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(77);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1419:
       ACCEPT_TOKEN(anon_sym_POUND2);
@@ -29608,16 +29580,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1520:
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH);
       if (lookahead == '"') ADVANCE(77);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1521:
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1522:
       ACCEPT_TOKEN(anon_sym_POUND_SEMI);
@@ -29625,16 +29593,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1523:
       ACCEPT_TOKEN(anon_sym_POUND_SEMI);
       if (lookahead == '"') ADVANCE(77);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1524:
       ACCEPT_TOKEN(anon_sym_POUND_SEMI);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1525:
       ACCEPT_TOKEN(anon_sym_SEMI);
@@ -29642,16 +29606,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1526:
       ACCEPT_TOKEN(anon_sym_SEMI);
       if (lookahead == '"') ADVANCE(77);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1527:
       ACCEPT_TOKEN(anon_sym_SEMI);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1528:
       ACCEPT_TOKEN(anon_sym_POUND_POUND_SEMI);
@@ -29659,16 +29619,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1529:
       ACCEPT_TOKEN(anon_sym_POUND_POUND_SEMI);
       if (lookahead == '"') ADVANCE(77);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1530:
       ACCEPT_TOKEN(anon_sym_POUND_POUND_SEMI);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1531:
       ACCEPT_TOKEN(anon_sym_SLASH_STAR);
@@ -29676,16 +29632,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1532:
       ACCEPT_TOKEN(anon_sym_SLASH_STAR);
       if (lookahead == '"') ADVANCE(77);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1418);
+      if (lookahead != 0) ADVANCE(1418);
       END_STATE();
     case 1533:
       ACCEPT_TOKEN(anon_sym_SLASH_STAR);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1534:
       ACCEPT_TOKEN(anon_sym_STAR_SLASH);
@@ -30203,42 +30155,32 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '/') ADVANCE(1665);
       if (lookahead == ';') ADVANCE(1527);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1664:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead == '#') ADVANCE(1666);
       if (lookahead == ';') ADVANCE(1524);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1665:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead == '*') ADVANCE(1533);
       if (lookahead == '/') ADVANCE(1521);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1666:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead == ';') ADVANCE(1530);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1667:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1667);
+          lookahead != '\n') ADVANCE(1667);
       END_STATE();
     case 1668:
       ACCEPT_TOKEN(aux_sym_mnemonic_name_token1);
@@ -964162,7 +964104,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_core(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 14,
+      .patch_version = 16,
     },
   };
   return &language;

package/core/src/scanner.c

@@ -21,12 +21,13 @@ unsigned tree_sitter_objectscript_core_external_scanner_serialize(
   struct ObjectScript_Core_Scanner *s = (struct ObjectScript_Core_Scanner *)payload;
 
   unsigned i = 0;
-  const unsigned char version = 1;
+  const unsigned char version = 2;
   unsigned char mlen = (unsigned char)(s->marker_buffer_len);
 
-  // Ensure we never overrun TREE_SITTER_SERIALIZATION_BUFFER_SIZE (usually 1024)
+  // Ensure we never overrun TREE_SITTER_SERIALIZATION_BUFFER_SIZE (usually 1024).
   // Worst-case here: 1 + 1 + 1 + 30*4 = 123 bytes.
   buffer[i++] = (char)version;
+  buffer[i++] = s->pending_dotted_block_end ? 1 : 0;
   buffer[i++] = (char)mlen;
 
   for (int j = 0; j < s->marker_buffer_len; j++) {
@@ -48,17 +49,26 @@ void tree_sitter_objectscript_core_external_scanner_deserialize(
     void *payload, const char *buffer, unsigned length) {
   struct ObjectScript_Core_Scanner *s = (struct ObjectScript_Core_Scanner *)payload;
 
-  // Reset to clean defaults first
   s->marker_buffer_len = 0;
+  s->pending_dotted_block_end = false;
 
   if (!buffer || length == 0) return;
 
   unsigned i = 0;
   unsigned char version = (unsigned char)buffer[i++];
-  if (version != 1 || i >= length) return;
-
   if (i >= length) return;
-  unsigned char mlen = (unsigned char)buffer[i++];
+
+  unsigned char mlen = 0;
+  if (version == 1) {
+    mlen = (unsigned char)buffer[i++];
+  } else if (version == 2) {
+    s->pending_dotted_block_end = buffer[i++] != 0;
+    if (i >= length) return;
+    mlen = (unsigned char)buffer[i++];
+  } else {
+    return;
+  }
+
   if (mlen > MARKER_BUFFER_MAX_LEN) mlen = MARKER_BUFFER_MAX_LEN;
 
   int j = 0;

package/expr/src/parser.c

@@ -2284,9 +2284,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == ' ') ADVANCE(876);
       if (lookahead != 0 &&
           lookahead != '*' &&
-          lookahead != ':' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(875);
+          lookahead != ':') ADVANCE(875);
       END_STATE();
     case 3:
       ADVANCE_MAP(
@@ -2597,9 +2595,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 15:
       if (lookahead == '"') ADVANCE(981);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(15);
+      if (lookahead != 0) ADVANCE(15);
       END_STATE();
     case 16:
       ADVANCE_MAP(
@@ -2655,9 +2651,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(984);
       if (lookahead == '\\') ADVANCE(159);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(18);
+          lookahead != '\n') ADVANCE(18);
       END_STATE();
     case 19:
       if (lookahead == '"') ADVANCE(874);
@@ -2725,25 +2719,19 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(825);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(25);
+          lookahead != '\r') ADVANCE(25);
       END_STATE();
     case 26:
       if (lookahead == '"') ADVANCE(29);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(26);
+          lookahead != '\r') ADVANCE(26);
       END_STATE();
     case 27:
       if (lookahead == '"') ADVANCE(40);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(27);
+          lookahead != '\r') ADVANCE(27);
       END_STATE();
     case 28:
       if (lookahead == '"') ADVANCE(882);
@@ -2804,9 +2792,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(35);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(34);
+          lookahead != '\r') ADVANCE(34);
       END_STATE();
     case 35:
       if (lookahead == '"') ADVANCE(34);
@@ -7652,9 +7638,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(984);
       if (lookahead == '\\') ADVANCE(159);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(18);
+          lookahead != '\n') ADVANCE(18);
       END_STATE();
     case 875:
       ACCEPT_TOKEN(aux_sym_sql_field_identifier_token2);
@@ -7669,9 +7653,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '"' &&
           lookahead != '*' &&
           lookahead != ':' &&
-          lookahead != '\\' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(875);
+          lookahead != '\\') ADVANCE(875);
       END_STATE();
     case 877:
       ACCEPT_TOKEN(aux_sym_sql_field_identifier_token3);
@@ -7690,16 +7672,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(28);
       if (('\t' <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(881);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(882);
+      if (lookahead != 0) ADVANCE(882);
       END_STATE();
     case 882:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(28);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(882);
+      if (lookahead != 0) ADVANCE(882);
       END_STATE();
     case 883:
       ACCEPT_TOKEN(anon_sym_POUND2);
@@ -30210,7 +30188,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_expr(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 14,
+      .patch_version = 16,
     },
   };
   return &language;