@bablr/language-en-regex-vm-pattern 0.9.0 → 0.10.0

package/lib/grammar.js

@@ -1,6 +1,6 @@
 /* @macrome
  * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#668869863dcbbe5d7e42f8cae9451aa4d70fbf6e
+ * @generatedfrom ./grammar.macro.js#44cd5c6d803ea69c494531d65db6b33a5faa09cb
  * This file is autogenerated. Please do not edit it directly.
  * When editing run `npx macrome watch` then change the file this is generated from.
  */
@@ -10,7 +10,7 @@ import { re, spam as m } from '@bablr/boot';
 import { Node, CoveredBy, InjectFrom, UndefinedAttributes, AllowEmpty, Literal } from '@bablr/helpers/decorators';
 import objectEntries from 'iter-tools-es/methods/object-entries';
 import * as Shared from '@bablr/helpers/productions';
-import { eat, eatMatch, match, holdForMatch, guard, defineAttribute, fail, o } from '@bablr/helpers/grammar';
+import { eat, eatMatch, match, shiftMatch, guard, defineAttribute, fail, o } from '@bablr/helpers/grammar';
 import { buildString, buildBoolean } from '@bablr/helpers/builders';
 export const canonicalURL = 'https://bablr.org/languages/core/en/bablr-regex-pattern';
 export const dependencies = {};
@@ -20,21 +20,6 @@ const escapables = new Map(objectEntries({
   t: '\t',
   0: '\0'
 }));
-export const getCooked = (escapeNode, span, ctx) => {
-  let cooked;
-  const codeNode = escapeNode.get('code');
-  const type = ctx.sourceTextFor(codeNode.get('typeToken'));
-  const value = ctx.sourceTextFor(codeNode.get('value'));
-  if (!type) {
-    const match_ = ctx.sourceTextFor(codeNode);
-    cooked = escapables.get(match_) || match_;
-  } else if (type === 'u' || type === 'x') {
-    cooked = parseInt(value, 16);
-  } else {
-    throw new Error();
-  }
-  return cooked.toString(10);
-};
 const flagCharacters = {
   global: 'g',
   ignoreCase: 'i',
@@ -46,7 +31,7 @@ const flagCharacters = {
 const unique = flags => flags.length === new Set(flags).size;
 const getSpecialPattern = span => {
   if (span === 'Pattern') {
-    return re`/[*+{}[\]().^$|\n\\<>]/`;
+    return re`/[*+?{}[\]().^$|\n\\<>]/`;
   } else if (span === 'CharacterClass') {
     return re`/[\]\\]/`;
   } else {
@@ -102,9 +87,9 @@ export const grammar = class RegexGrammar {
   }
   *Element() {
     yield guard(m`<*Keyword /[*+?]/ />`);
-    yield eat(m`<_Any />`, [m`<CharacterClass '[' />`, m`<Group '(?:' />`, m`<__Assertion /[$^]|\\b/i />`, m`<Gap '\\g' />`, m`<__CharacterSet /\.|\\[dswp]/i />`, m`<*Character />`]);
+    yield eat(m`<_Any />`, [m`<CharacterClass '[' />`, m`<Group '(?:' />`, m`<_Assertion /[$^]|\\b/i />`, m`<Gap '\\g' />`, m`<_CharacterSet /\.|\\[dswp]/i />`, m`<*Character />`]);
     if (yield match(re`/[*+?{]/`)) {
-      return holdForMatch(m`<Quantifier />`);
+      return shiftMatch(m`<Quantifier />`);
     }
   }
   *Group() {
@@ -156,9 +141,9 @@ export const grammar = class RegexGrammar {
     yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
   }
   *CharacterClassElement() {
-    yield eat(m`<_Any />`, [m`<__CharacterSet /\\[dswp]/i />`, m`<Gap '\\g' />`, m`<*Character />`]);
+    yield eat(m`<_Any />`, [m`<_CharacterSet /\\[dswp]/i />`, m`<Gap '\\g' />`, m`<*Character />`]);
     if (yield match('-')) {
-      return holdForMatch(m`<CharacterClassRange />`);
+      return shiftMatch(m`<CharacterClassRange />`);
     }
   }
   *CharacterClassRange() {
@@ -218,6 +203,8 @@ export const grammar = class RegexGrammar {
             max: 1
           };
           break;
+        default:
+          yield fail();
       }
     } else if (yield eat(m`openToken: <*Punctuator '{' { balanced: '}' } />`)) {
       let max;
@@ -251,17 +238,22 @@ export const grammar = class RegexGrammar {
     const parentSpan = state.span;
     yield eat(m`escape: <*Punctuator '\\' { openSpan: 'Escape' } />`);
     let m_;
+    let cooked;
     if (m_ = yield match(re`/[\\/nrt0]/`)) {
       const match_ = ctx.sourceTextFor(m_);
       yield eat(m`code: <*Keyword ${buildString(match_)} { closeSpan: 'Escape' } />`);
+      cooked = escapables.get(match_) || match_;
     } else if (m_ = yield match(getSpecialPattern(parentSpan))) {
-      const match_ = ctx.sourceTextFor(m_);
-      yield eat(m`code: <*Keyword ${buildString(match_)} { closeSpan: 'Escape' } />`);
+      cooked = ctx.sourceTextFor(m_);
+      yield eat(m`code: <*Keyword ${buildString(cooked)} { closeSpan: 'Escape' } />`);
     } else if (yield match(re`/[ux]/`)) {
-      yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+      let code = yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+      let value = code.get('value');
+      cooked = String.fromCodePoint(parseInt(ctx.sourceTextFor(value), 16));
     } else {
       yield fail();
     }
+    yield defineAttribute('cooked', cooked);
   }
   *EscapeCode() {
     if (yield eatMatch(m`type: <*Keyword 'u' />`)) {

package/lib/grammar.macro.js

@@ -13,7 +13,7 @@ import {
   eat,
   eatMatch,
   match,
-  holdForMatch,
+  shiftMatch,
   guard,
   defineAttribute,
   fail,
@@ -34,25 +34,6 @@ const escapables = new Map(
   }),
 );
 
-export const getCooked = (escapeNode, span, ctx) => {
-  let cooked;
-  const codeNode = escapeNode.get('code');
-  const type = ctx.sourceTextFor(codeNode.get('typeToken'));
-  const value = ctx.sourceTextFor(codeNode.get('value'));
-
-  if (!type) {
-    const match_ = ctx.sourceTextFor(codeNode);
-
-    cooked = escapables.get(match_) || match_;
-  } else if (type === 'u' || type === 'x') {
-    cooked = parseInt(value, 16);
-  } else {
-    throw new Error();
-  }
-
-  return cooked.toString(10);
-};
-
 const flagCharacters = {
   global: 'g',
   ignoreCase: 'i',
@@ -66,7 +47,7 @@ const unique = (flags) => flags.length === new Set(flags).size;
 
 const getSpecialPattern = (span) => {
   if (span === 'Pattern') {
-    return re`/[*+{}[\]().^$|\n\\<>]/`;
+    return re`/[*+?{}[\]().^$|\n\\<>]/`;
   } else if (span === 'CharacterClass') {
     return re`/[\]\\]/`;
   } else {
@@ -133,14 +114,14 @@ export const grammar = class RegexGrammar {
     yield eat(m`<_Any />`, [
       m`<CharacterClass '[' />`,
       m`<Group '(?:' />`,
-      m`<__Assertion /[$^]|\\b/i />`,
+      m`<_Assertion /[$^]|\\b/i />`,
       m`<Gap '\\g' />`,
-      m`<__CharacterSet /\.|\\[dswp]/i />`,
+      m`<_CharacterSet /\.|\\[dswp]/i />`,
       m`<*Character />`,
     ]);
 
     if (yield match(re`/[*+?{]/`)) {
-      return holdForMatch(m`<Quantifier />`);
+      return shiftMatch(m`<Quantifier />`);
     }
   }
 
@@ -225,14 +206,10 @@ export const grammar = class RegexGrammar {
   }
 
   *CharacterClassElement() {
-    yield eat(m`<_Any />`, [
-      m`<__CharacterSet /\\[dswp]/i />`,
-      m`<Gap '\\g' />`,
-      m`<*Character />`,
-    ]);
+    yield eat(m`<_Any />`, [m`<_CharacterSet /\\[dswp]/i />`, m`<Gap '\\g' />`, m`<*Character />`]);
 
     if (yield match('-')) {
-      return holdForMatch(m`<CharacterClassRange />`);
+      return shiftMatch(m`<CharacterClassRange />`);
     }
   }
 
@@ -315,6 +292,8 @@ export const grammar = class RegexGrammar {
         case '?':
           attrs = { min: 0, max: 1 };
           break;
+        default:
+          yield fail();
       }
     } else if (yield eat(m`openToken: <*Punctuator '{' { balanced: '}' } />`)) {
       let max;
@@ -356,18 +335,27 @@ export const grammar = class RegexGrammar {
     yield eat(m`escape: <*Punctuator '\\' { openSpan: 'Escape' } />`);
 
     let m_;
+    let cooked;
 
     if ((m_ = yield match(re`/[\\/nrt0]/`))) {
       const match_ = ctx.sourceTextFor(m_);
       yield eat(m`code: <*Keyword ${buildString(match_)} { closeSpan: 'Escape' } />`);
+
+      cooked = escapables.get(match_) || match_;
     } else if ((m_ = yield match(getSpecialPattern(parentSpan)))) {
-      const match_ = ctx.sourceTextFor(m_);
-      yield eat(m`code: <*Keyword ${buildString(match_)} { closeSpan: 'Escape' } />`);
+      cooked = ctx.sourceTextFor(m_);
+      yield eat(m`code: <*Keyword ${buildString(cooked)} { closeSpan: 'Escape' } />`);
     } else if (yield match(re`/[ux]/`)) {
-      yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+      let code = yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+
+      let value = code.get('value');
+
+      cooked = String.fromCodePoint(parseInt(ctx.sourceTextFor(value), 16));
     } else {
       yield fail();
     }
+
+    yield defineAttribute('cooked', cooked);
   }
 
   @Node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-regex-vm-pattern",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A BABLR language for nonbacktracking JS-style regexes",
   "engines": {
     "node": ">=12.0.0"
@@ -22,14 +22,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.2",
-    "@bablr/boot": "0.8.1",
-    "@bablr/helpers": "0.22.1",
-    "@bablr/agast-helpers": "0.7.1",
-    "@bablr/agast-vm-helpers": "0.7.1",
+    "@bablr/boot": "0.9.0",
+    "@bablr/helpers": "0.23.0",
+    "@bablr/agast-helpers": "0.8.0",
+    "@bablr/agast-vm-helpers": "0.8.0",
     "iter-tools-es": "7.5.3"
   },
   "devDependencies": {
-    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
+    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
     "@bablr/macrome": "^0.1.3",
     "@bablr/macrome-generator-bablr": "^0.3.2",
     "@qnighy/dedent": "0.1.1",