@bablr/boot 0.1.6 → 0.1.8

package/lib/languages/regex.js

@@ -291,11 +291,13 @@ const grammar = class RegexMiniparserGrammar {
     let attrs;
 
     if (p.eatMatch('*', KW, { path: 'value' })) {
-      attrs = { min: 0, max: Infinity };
+      const greedy = !p.eatMatch('?', KW, { path: 'greedyOperator' });
+      attrs = { min: 0, max: Infinity, greedy };
     } else if (p.eatMatch('+', KW, { path: 'value' })) {
-      attrs = { min: 1, max: Infinity };
+      const greedy = !p.eatMatch('?', KW, { path: 'greedyOperator' });
+      attrs = { min: 1, max: Infinity, greedy };
     } else if (p.eatMatch('?', KW, { path: 'value' })) {
-      attrs = { min: 0, max: 1 };
+      attrs = { min: 0, max: 1, greedy: true };
     } else if (p.match('{')) {
       p.eat('{', PN, { path: 'open', balanced: '}' });
 
@@ -306,9 +308,11 @@ const grammar = class RegexMiniparserGrammar {
         max = p.eatMatch(/\d+/y, 'Number', { path: 'max' });
       }
 
-      attrs = { min: min && parseInt(min, 10), max: max && parseInt(max, 10) };
-
       p.eat('}', PN, { path: 'close', balancer: true });
+
+      const greedy = !p.eatMatch('?', KW, { path: 'greedyOperator' });
+
+      attrs = { min: min && parseInt(min, 10), max: max && parseInt(max, 10), greedy };
     }
 
     return { attrs };

package/lib/languages/spamex.js

@@ -71,12 +71,12 @@ const grammar = class SpamexMiniparserGrammar {
     p.eatProduction('TagType', { path: 'type' });
     let sp = p.eatMatchTrivia(_);
 
-    if (sp && p.match(/['"/]/y)) {
+    if (sp && (p.match(/['"/]/y) || p.atExpression)) {
       p.eatProduction('StringMatcher', { path: 'value' });
       sp = p.eatMatchTrivia(_);
     }
 
-    if (sp && p.match(/\w+/y)) {
+    if (sp && (p.match(/\w+/y) || p.atExpression)) {
       p.eatProduction('Attributes', { path: 'attributes[]' });
       sp = p.eatMatchTrivia(_);
     }

package/lib/languages/string.js

@@ -24,10 +24,6 @@ const escapables = new Map(
 const cookEscape = (escape, span) => {
   let hexMatch;
 
-  if (!span.type.startsWith('String')) {
-    throw new Error();
-  }
-
   if (!escape.startsWith('\\')) {
     throw new Error('string escape must start with \\');
   }
@@ -44,11 +40,11 @@ const cookEscape = (escape, span) => {
     return String.fromCodePoint(parseInt(hexMatch[1], 16));
   }
 
-  const litPattern = span === 'String:Single' ? /\\([\\nrt0'])/y : /\\([\\nrt0"])/y;
+  const litPattern = span === 'Single' ? /\\([\\nrt0'])/y : /\\([\\nrt0"])/y;
   const litMatch = litPattern.exec(escape);
 
   if (litMatch) {
-    return escapables.get(litMatch[1]);
+    return escapables.get(litMatch[1]) || litMatch[1];
   }
 
   throw new Error('unable to cook string escape');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/boot",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"