Merge pull request #20 from lark-parser/issue17b

Another bugfix for issue #17

Author: erezsh

larkjs/lark.js

@@ -1499,7 +1499,7 @@ class PatternStr extends Pattern {
   static get __serialize_fields__() {
     return ["value", "flags"];
   }
-  type = "str";
+  static get type() { return "str"; }
   to_regexp() {
     return this._get_flags(re.escape(this.value));
   }
@@ -1517,7 +1517,7 @@ class PatternRE extends Pattern {
   static get __serialize_fields__() {
     return ["value", "flags", "_width"];
   }
-  type = "re";
+  static get type() { return "re"; }
   to_regexp() {
     return this._get_flags(this.value);
   }
@@ -1723,12 +1723,12 @@ class _CallChain {
 const CallChain = callable_class(_CallChain);
 function _create_unless(terminals, g_regex_flags, re_, use_bytes) {
   let s, unless;
-  let tokens_by_type = classify(terminals, (t) => t.pattern.constructor.name);
+  let tokens_by_type = classify(terminals, (t) => t.pattern.constructor.type);
   let embedded_strs = new Set();
   let callback = {};
-  for (const retok of tokens_by_type.get('PatternRE') || []) {
+  for (const retok of tokens_by_type.get('re') || []) {
     unless = [];
-    for (const strtok of tokens_by_type.get('PatternStr') || []) {
+    for (const strtok of tokens_by_type.get('str') || []) {
       if (strtok.priority !== retok.priority) {
         continue;
       }

test/test.py

@@ -63,7 +63,7 @@ def test_json_parser():
 
     res = js_parser.parse(text, transformer)
     expected = r"""{"empty_object":{},"empty_array":[],"booleans":{"YES":true,"NO":false},"numbers":[0,1,-2,3.3,440000,6.6e-7],"strings":["This",["And","That","And a \\\"b"]],"nothing":null}"""
-    assert res.strip() == expected
+    assert res.strip() == expected, res
 
 def test():
     test_json_parser()