@acristoffers/tree-sitter-matlab 1.2.4 → 1.2.13

package/src/scanner.c

@@ -48,6 +48,7 @@ typedef struct
     bool line_continuation;
     bool is_shell_scape;
     char string_delimiter;
+    bool generate_entry_delimiter;
 } Scanner;
 
 static const char* const keywords[] = {
@@ -155,7 +156,7 @@ static inline int consume_whitespaces(TSLexer* lexer)
 
 static inline void consume_whitespaces_once(TSLexer* lexer)
 {
-    while (iswspace(lexer->lookahead)) {
+    while (!lexer->eof(lexer) && iswspace(lexer->lookahead)) {
         if (lexer->lookahead == '\n' || lexer->lookahead == '\r') {
             advance(lexer);
             break;
@@ -184,7 +185,8 @@ unsigned tree_sitter_matlab_external_scanner_serialize(void* payload, char* buff
     buffer[1] = (char) scanner->line_continuation;
     buffer[2] = (char) scanner->is_shell_scape;
     buffer[3] = scanner->string_delimiter;
-    return 4;
+    buffer[4] = (char) scanner->generate_entry_delimiter;
+    return 5;
 }
 
 void tree_sitter_matlab_external_scanner_deserialize(
@@ -193,11 +195,12 @@ void tree_sitter_matlab_external_scanner_deserialize(
     unsigned length)
 {
     Scanner* scanner = (Scanner*) payload;
-    if (length == 4) {
+    if (length == 5) {
         scanner->is_inside_command = buffer[0];
         scanner->line_continuation = buffer[1];
         scanner->is_shell_scape = buffer[2];
         scanner->string_delimiter = buffer[3];
+        scanner->generate_entry_delimiter = buffer[4];
     }
 }
 
@@ -209,7 +212,12 @@ static inline void consume_comment_line(TSLexer* lexer)
 }
 
 // NOLINTNEXTLINE(*misc-no-recursion)
-static bool scan_comment(TSLexer* lexer, bool entry_delimiter, bool ctranspose)
+static bool scan_comment(
+    Scanner* scanner,
+    TSLexer* lexer,
+    bool entry_delimiter,
+    bool ctranspose,
+    int skipped)
 {
     lexer->mark_end(lexer);
 
@@ -222,34 +230,61 @@ static bool scan_comment(TSLexer* lexer, bool entry_delimiter, bool ctranspose)
     // ended up being handled here. It allows the correct detection of numbers
     // like .5 inside matrices/cells: [0 .5].
     if (entry_delimiter && !percent && !line_continuation) {
-        lexer->result_symbol = ENTRY_DELIMITER;
-        return iswdigit(lexer->lookahead);
+        if (iswdigit(lexer->lookahead)) {
+            lexer->result_symbol = ENTRY_DELIMITER;
+            return true;
+        }
+        if (lexer->lookahead == '\'') {
+            advance(lexer);
+            lexer->result_symbol = CTRANSPOSE;
+            lexer->mark_end(lexer);
+            return skipped == 0;
+        }
+        return false;
     }
+
     // We are inside a matrix/cell row and there is a line continuation, like this:
     // a = { 1 ...
     //       2 ...
     // }
-
     if (entry_delimiter && line_continuation) {
+        consume_comment_line(lexer);
         consume_whitespaces(lexer);
-        if (lexer->lookahead == '.') {
-            lexer->mark_end(lexer);
+
+        lexer->mark_end(lexer);
+        lexer->result_symbol = LINE_CONTINUATION;
+
+        const bool is_alpha = iswalpha(lexer->lookahead);
+        const bool is_digit = iswdigit(lexer->lookahead);
+        const bool is_meta = lexer->lookahead == '?' || lexer->lookahead == '@';
+        const bool is_quote = lexer->lookahead == '\'' || lexer->lookahead == '"';
+        const bool is_container = lexer->lookahead == '{' || lexer->lookahead == '['
+                                  || lexer->lookahead == '(';
+
+        if (lexer->lookahead == '~') {
             advance(lexer);
-            lexer->result_symbol = iswdigit(lexer->lookahead) ? ENTRY_DELIMITER : LINE_CONTINUATION;
-        } else if (iswdigit(lexer->lookahead) || lexer->lookahead == '\'' || lexer->lookahead == '"') {
-            lexer->result_symbol = ENTRY_DELIMITER;
-        } else {
-            lexer->result_symbol = LINE_CONTINUATION;
-            lexer->mark_end(lexer);
+            scanner->generate_entry_delimiter = lexer->lookahead != '=';
+        } else if (lexer->lookahead == '+' || lexer->lookahead == '-') {
+            advance(lexer);
+            scanner->generate_entry_delimiter = lexer->lookahead != ' ';
+        } else if (lexer->lookahead == '.') {
+            advance(lexer);
+            scanner->generate_entry_delimiter = is_digit;
+        } else if (is_alpha || is_digit || is_quote || is_container || is_meta) {
+            scanner->generate_entry_delimiter = true;
         }
         return true;
     }
 
     if (block) {
+        if (skipped & 2) {
+            return false;
+        }
+
+        // If it has things on the same line, it's not a block, just a comment
         while (!lexer->eof(lexer) && iswspace_matlab(lexer->lookahead)) {
             advance(lexer);
         }
-
         if (!consume_char('\n', lexer) && !consume_char('\r', lexer)) {
             consume_comment_line(lexer);
             lexer->result_symbol = COMMENT;
@@ -257,26 +292,30 @@ static bool scan_comment(TSLexer* lexer, bool entry_delimiter, bool ctranspose)
             return true;
         }
 
-        // Empty block comment
-        if (lexer->lookahead == '%' && consume_char('%', lexer) && consume_char('}', lexer)) {
-            lexer->result_symbol = COMMENT;
-            lexer->mark_end(lexer);
-            return true;
-        }
-
+        // Otherwise, find the matching closing block
+        int level = 1;
         while (!lexer->eof(lexer)) {
-            consume_comment_line(lexer);
-            advance(lexer);
             consume_whitespaces(lexer);
-
-            if (consume_char('%', lexer) && consume_char('}', lexer)) {
-                lexer->result_symbol = COMMENT;
-                lexer->mark_end(lexer);
-                return true;
+            if (consume_char('%', lexer)) {
+                if (consume_char('{', lexer) && (consume_whitespaces(lexer) & 2)) {
+                    level++;
+                } else if (consume_char('}', lexer)) {
+                    lexer->mark_end(lexer);
+                    if (consume_whitespaces(lexer) & 2) {
+                        level--;
+                    }
+                }
+                if (level == 0) {
+                    break;
+                }
+                continue;
             }
+            consume_comment_line(lexer);
+            lexer->mark_end(lexer);
         }
 
-        return false;
+        lexer->result_symbol = COMMENT;
+        return true;
     }
 
     if (percent || line_continuation) {
@@ -300,7 +339,7 @@ static bool scan_comment(TSLexer* lexer, bool entry_delimiter, bool ctranspose)
         }
 
         if (lexer->lookahead == '%') {
-            return scan_comment(lexer, false, false);
+            return scan_comment(scanner, lexer, false, false, 0);
         }
 
         return true;
@@ -357,6 +396,9 @@ static bool scan_command(Scanner* scanner, TSLexer* lexer, const bool* valid_sym
                 // If it is a keyword, yield to the internal scanner
                 for (size_t i = 0; i < keywords_size; i++) {
                     if (strcmp(keywords[i], buffer) == 0) {
+                        if (strcmp("enumeration", buffer) == 0) {
+                            goto check_enumeration;
+                        }
                         return false;
                     }
                 }
@@ -378,6 +420,18 @@ static bool scan_command(Scanner* scanner, TSLexer* lexer, const bool* valid_sym
     }
     goto skip_command_check;
 
+check_enumeration: {
+    const int skipped = consume_whitespaces(lexer);
+    if (skipped & 2) {
+        // enumeration can be a function
+        if (lexer->lookahead == '(') {
+            lexer->result_symbol = IDENTIFIER;
+            return true;
+        }
+    }
+    return false;
+}
+
 check_command_for_argument:
     // If this is a keyword-command, check if it has an argument.
     // If it has no arguments, this is a keyword, not a command.
@@ -392,7 +446,6 @@ check_command_for_argument:
     return false;
 
 skip_command_check:
-
     // First case: found an end-of-line already, so this is a command for sure.
     // example:
     // pwd
@@ -412,7 +465,13 @@ skip_command_check:
 
     // If followed by a line continuation, look after it
     const int skipped = consume_whitespaces(lexer);
-    if (skipped & 4) { // Command followed by spaces then newline
+    if (skipped & 2) {
+        // `catch e `
+        if (valid_symbols[CATCH_IDENTIFIER]) {
+            lexer->result_symbol = CATCH_IDENTIFIER;
+            return true;
+        }
+        // Command followed by spaces then newline
         scanner->is_inside_command = false;
         lexer->result_symbol = COMMAND_NAME;
         return true;
@@ -435,7 +494,11 @@ skip_command_check:
 
     // Check for end-of-line again, since it may be that the user just put a
     // space at the end, like `pwd ;`
-    if (is_eol(lexer->lookahead)) {
+    if (is_eol(lexer->lookahead) || lexer->lookahead == '%') {
+        if (valid_symbols[CATCH_IDENTIFIER] && (skipped & 4) == 0) {
+            lexer->result_symbol = CATCH_IDENTIFIER;
+            return true;
+        }
         scanner->is_inside_command = true;
         return true;
     }
@@ -622,7 +685,7 @@ static bool scan_command_argument(Scanner* scanner, TSLexer* lexer)
                 lexer->mark_end(lexer);
                 return true;
             }
-            return scan_comment(lexer, false, false);
+            return scan_comment(scanner, lexer, false, false, 0);
         }
 
         // Line continuation
@@ -1037,12 +1100,21 @@ static bool scan_transpose(TSLexer* lexer)
 bool tree_sitter_matlab_external_scanner_scan(void* payload, TSLexer* lexer, const bool* valid_symbols)
 {
     Scanner* scanner = (Scanner*) payload;
+
+    if (scanner->generate_entry_delimiter) {
+        scanner->generate_entry_delimiter = false;
+        lexer->mark_end(lexer);
+        lexer->result_symbol = ENTRY_DELIMITER;
+        return true;
+    }
+
     if (scanner->string_delimiter == 0) {
         int skipped = skip_whitespaces(lexer);
 
         if ((scanner->line_continuation || !scanner->is_inside_command) && valid_symbols[COMMENT]
             && (lexer->lookahead == '%' || ((skipped & 2) == 0 && lexer->lookahead == '.'))) {
-            return scan_comment(lexer, valid_symbols[ENTRY_DELIMITER], valid_symbols[CTRANSPOSE]);
+            return scan_comment(
+                scanner, lexer, valid_symbols[ENTRY_DELIMITER], valid_symbols[CTRANSPOSE], skipped);
         }
 
         if (!scanner->is_inside_command) {

package/tree-sitter.json

@@ -12,7 +12,7 @@
     }
   ],
   "metadata": {
-    "version": "1.2.4",
+    "version": "1.2.13",
     "license": "MIT",
     "description": "MATLAB tree-sitter parser",
     "authors": [