Be more flexible with escape parsing, avoid infinite loops with inval…

…id escapes
koto-lang · Jan 9, 2024 · 10d620f · 10d620f
1 parent 2c23f01
commit 10d620f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/grammar.js b/grammar.js
@@ -609,16 609,15 @@ module.exports = grammar({
  escape: $ => seq(
  '\\',
  choice(
- 'n',
- 'r',
- 't',
- '$',
- '\'',
- '"',
- '\\',
  // Any single non-whitespace character
  // (we don't need to list all valid escape characters)
  /\S/,
  // Newline
  /\r?\n/,
  // \x42
  /x[0-9a-fA-F]{2}/,
- /u\{[0-9a-fA-F]{1,6}\}/
  // \u{123456}
  /u\{[0-9a-fA-F]{1,6}\}/,
  )
  ),
  }

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/src/scanner.c b/src/scanner.c
@@ -229,7 229,8 @@ bool tree_sitter_koto_external_scanner_scan(
  }
 
  // String start/end detection
- if (valid_symbols[STRING_START] && (next == '"' || next == '\'')) {
  if (valid_symbols[STRING_START] && !scanner->in_string
  && (next == '"' || next == '\'')) {
  printf(">>>> string start\n");
  scanner->in_string = true;
  VEC_PUSH(scanner->quotes, next);