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

package/lib/grammar.js

@@ -1,6 +1,6 @@
 /* @macrome
  * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#668869863dcbbe5d7e42f8cae9451aa4d70fbf6e
+ * @generatedfrom ./grammar.macro.js#c3c390f3e54607dfde1d07c0e099e54294ab7f32
  * 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,31 +10,17 @@ 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 { buildString, buildBoolean } from '@bablr/helpers/builders';
+import { eat, eatMatch, match, shiftMatch, guard, defineAttribute, fail, o } from '@bablr/helpers/grammar';
+import { buildString } from '@bablr/helpers/builders';
 export const canonicalURL = 'https://bablr.org/languages/core/en/bablr-regex-pattern';
 export const dependencies = {};
+export const defaultMatcher = m`<Pattern />`;
 const escapables = new Map(objectEntries({
   n: '\n',
   r: '\r',
   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 +32,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 {
@@ -62,7 +48,7 @@ export const grammar = class RegexGrammar {
   }
   *[(_FlagsDecs = [UndefinedAttributes(Object.keys(flagCharacters)), AllowEmpty, Node], _GroupDecs = [CoveredBy('Element'), Node], _AssertionDecs = CoveredBy('Element'), _StartOfInputAssertionDecs = [CoveredBy('Assertion'), Node], _EndOfInputAssertionDecs = [CoveredBy('Assertion'), Node], _WordBoundaryAssertionDecs = [UndefinedAttributes(['negate']), CoveredBy('Assertion'), Node], _GapDecs = [CoveredBy('Assertion'), Node], _CharacterDecs = [CoveredBy('Element'), CoveredBy('CharacterClassElement'), Node], _CharacterClassDecs = [UndefinedAttributes(['negate']), CoveredBy('Element'), Node], _CharacterClassRangeDecs = [CoveredBy('CharacterClassElement'), Node], _CharacterSetDecs = CoveredBy('Element'), _AnyCharacterSetDecs = [CoveredBy('Element'), CoveredBy('CharacterSet'), Node], _DigitCharacterSetDecs = [UndefinedAttributes(['negate']), CoveredBy('Element'), CoveredBy('CharacterSet'), Node], _SpaceCharacterSetDecs = [UndefinedAttributes(['negate']), CoveredBy('Element'), CoveredBy('CharacterSet'), Node], _WordCharacterSetDecs = [UndefinedAttributes(['negate']), CoveredBy('Element'), CoveredBy('CharacterSet'), Node], _QuantifierDecs = [UndefinedAttributes(['min', 'max']), Node], _AnyDecs = InjectFrom(Shared), _KeywordDecs = [Literal, Node, InjectFrom(Shared)], _PunctuatorDecs = [Literal, Node, InjectFrom(Shared)], "Pattern")]() {
     yield eat(m`openToken: <*Punctuator '/' { balanced: '/', balancedSpan: 'Pattern' } />`);
-    yield eat(m`<_Alternatives />`);
+    yield eat(m`<__Alternatives />`);
     yield eat(m`closeToken: <*Punctuator '/' { balancer: true } />`);
     yield eat(m`flags$: <Flags />`);
   }
@@ -89,36 +75,36 @@ export const grammar = class RegexGrammar {
   *Alternatives() {
     do {
       yield eat(m`alternatives[]$: <Alternative />`);
-    } while (yield eatMatch(m`separatorTokens[]: <*Punctuator '|' />`));
+    } while (yield eatMatch(m`#separatorTokens[]: <*Punctuator '|' />`));
   }
   *Alternative() {
-    yield eat(m`elements[]+$: <_Elements />`);
+    yield eat(m`elements[]+$: <__Elements />`);
   }
   *Elements() {
     yield eat(m`.[]: []`);
     while (yield match(re`/[^|]/`)) {
-      yield eat(m`.[]+: <__Element />`);
+      yield eat(m`.[]+: <_Element />`);
     }
   }
   *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() {
     yield eat(m`openToken: <*Punctuator '(?:' { balanced: ')' } />`);
-    yield eat(m`<_Alternatives />`);
+    yield eat(m`<__Alternatives />`);
     yield eat(m`closeToken: <*Punctuator ')' { balancer: true } />`);
   }
   *CapturingGroup() {
     yield eat(m`openToken: <*Punctuator '(' { balanced: ')' } />`);
-    yield eat(m`<_Alternatives />`);
+    yield eat(m`<__Alternatives />`);
     yield eat(m`closeToken: <*Punctuator ')' { balancer: true } />`);
   }
   *Assertion() {
-    yield eat(m`<_Any />`, [m`<*StartOfInputAssertion '^' />`, m`<*EndOfInputAssertion '$' />`, m`<*WordBoundaryAssertion /\\b/i />`]);
+    yield eat(m`<__Any />`, [m`<StartOfInputAssertion '^' />`, m`<EndOfInputAssertion '$' />`, m`<WordBoundaryAssertion /\\b/i />`]);
   }
   *StartOfInputAssertion() {
     yield eat(m`sigilToken: <*Keyword '^' />`);
@@ -131,7 +117,7 @@ export const grammar = class RegexGrammar {
   }) {
     yield eatMatch(m`escapeToken: <*Punctuator '\\' />`);
     const m_ = yield eat(m`value: <*Keyword /b/i />`);
-    yield defineAttribute('negate', buildBoolean(ctx.sourceTextFor(m_) === 'B'));
+    yield defineAttribute('negate', ctx.sourceTextFor(m_) === 'B');
   }
   *Gap() {
     yield eatMatch(m`escapeToken: <*Punctuator '\\' />`);
@@ -151,14 +137,14 @@ export const grammar = class RegexGrammar {
     }));
     yield defineAttribute('negate', !!negate);
     while (yield match(re`/./s`)) {
-      yield eat(m`elements[]+$: <__CharacterClassElement />`);
+      yield eat(m`elements[]+$: <_CharacterClassElement />`);
     }
     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() {
@@ -167,7 +153,7 @@ export const grammar = class RegexGrammar {
     yield eat(m`max+$: <*Character />`);
   }
   *CharacterSet() {
-    yield eat(m`<_Any />`, [m`<AnyCharacterSet '.' />`, m`<DigitCharacterSet /\\[dD]/  />`, m`<SpaceCharacterSet /\\[sS]/  />`, m`<WordCharacterSet /\\[wW]/  />`]);
+    yield eat(m`<__Any />`, [m`<AnyCharacterSet '.' />`, m`<DigitCharacterSet /\\[dD]/  />`, m`<SpaceCharacterSet /\\[sS]/  />`, m`<WordCharacterSet /\\[wW]/  />`]);
   }
   *AnyCharacterSet() {
     yield eat(m`sigilToken: <*Keyword '.' />`);
@@ -196,7 +182,7 @@ export const grammar = class RegexGrammar {
   *Quantifier({
     ctx
   }) {
-    yield eat(m`element+$: <__Element />`);
+    yield eat(m`element+$: <_Element />`);
     let attrs, sigil;
     if (sigil = yield eatMatch(m`sigilToken: <*Keyword /[*+?]/ />`)) {
       switch (ctx.sourceTextFor(sigil)) {
@@ -218,6 +204,8 @@ export const grammar = class RegexGrammar {
             max: 1
           };
           break;
+        default:
+          yield fail();
       }
     } else if (yield eat(m`openToken: <*Punctuator '{' { balanced: '}' } />`)) {
       let max;
@@ -251,17 +239,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,18 +13,20 @@ import {
   eat,
   eatMatch,
   match,
-  holdForMatch,
+  shiftMatch,
   guard,
   defineAttribute,
   fail,
   o,
 } from '@bablr/helpers/grammar';
-import { buildString, buildBoolean } from '@bablr/helpers/builders';
+import { buildString } from '@bablr/helpers/builders';
 
 export const canonicalURL = 'https://bablr.org/languages/core/en/bablr-regex-pattern';
 
 export const dependencies = {};
 
+export const defaultMatcher = m`<Pattern />`;
+
 const escapables = new Map(
   objectEntries({
     n: '\n',
@@ -34,25 +36,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 +49,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 {
@@ -78,7 +61,7 @@ export const grammar = class RegexGrammar {
   @Node
   *Pattern() {
     yield eat(m`openToken: <*Punctuator '/' { balanced: '/', balancedSpan: 'Pattern' } />`);
-    yield eat(m`<_Alternatives />`);
+    yield eat(m`<__Alternatives />`);
     yield eat(m`closeToken: <*Punctuator '/' { balancer: true } />`);
     yield eat(m`flags$: <Flags />`);
   }
@@ -110,27 +93,27 @@ export const grammar = class RegexGrammar {
   *Alternatives() {
     do {
       yield eat(m`alternatives[]$: <Alternative />`);
-    } while (yield eatMatch(m`separatorTokens[]: <*Punctuator '|' />`));
+    } while (yield eatMatch(m`#separatorTokens[]: <*Punctuator '|' />`));
   }
 
   @AllowEmpty
   @Node
   *Alternative() {
-    yield eat(m`elements[]+$: <_Elements />`);
+    yield eat(m`elements[]+$: <__Elements />`);
   }
 
   @AllowEmpty
   *Elements() {
     yield eat(m`.[]: []`);
     while (yield match(re`/[^|]/`)) {
-      yield eat(m`.[]+: <__Element />`);
+      yield eat(m`.[]+: <_Element />`);
     }
   }
 
   *Element() {
     yield guard(m`<*Keyword /[*+?]/ />`);
 
-    yield eat(m`<_Any />`, [
+    yield eat(m`<__Any />`, [
       m`<CharacterClass '[' />`,
       m`<Group '(?:' />`,
       m`<__Assertion /[$^]|\\b/i />`,
@@ -140,7 +123,7 @@ export const grammar = class RegexGrammar {
     ]);
 
     if (yield match(re`/[*+?{]/`)) {
-      return holdForMatch(m`<Quantifier />`);
+      return shiftMatch(m`<Quantifier />`);
     }
   }
 
@@ -148,23 +131,23 @@ export const grammar = class RegexGrammar {
   @Node
   *Group() {
     yield eat(m`openToken: <*Punctuator '(?:' { balanced: ')' } />`);
-    yield eat(m`<_Alternatives />`);
+    yield eat(m`<__Alternatives />`);
     yield eat(m`closeToken: <*Punctuator ')' { balancer: true } />`);
   }
 
   @Node
   *CapturingGroup() {
     yield eat(m`openToken: <*Punctuator '(' { balanced: ')' } />`);
-    yield eat(m`<_Alternatives />`);
+    yield eat(m`<__Alternatives />`);
     yield eat(m`closeToken: <*Punctuator ')' { balancer: true } />`);
   }
 
   @CoveredBy('Element')
   *Assertion() {
-    yield eat(m`<_Any />`, [
-      m`<*StartOfInputAssertion '^' />`,
-      m`<*EndOfInputAssertion '$' />`,
-      m`<*WordBoundaryAssertion /\\b/i />`,
+    yield eat(m`<__Any />`, [
+      m`<StartOfInputAssertion '^' />`,
+      m`<EndOfInputAssertion '$' />`,
+      m`<WordBoundaryAssertion /\\b/i />`,
     ]);
   }
 
@@ -186,7 +169,7 @@ export const grammar = class RegexGrammar {
   *WordBoundaryAssertion({ ctx }) {
     yield eatMatch(m`escapeToken: <*Punctuator '\\' />`);
     const m_ = yield eat(m`value: <*Keyword /b/i />`);
-    yield defineAttribute('negate', buildBoolean(ctx.sourceTextFor(m_) === 'B'));
+    yield defineAttribute('negate', ctx.sourceTextFor(m_) === 'B');
   }
 
   @CoveredBy('Assertion')
@@ -218,21 +201,21 @@ export const grammar = class RegexGrammar {
     yield defineAttribute('negate', !!negate);
 
     while (yield match(re`/./s`)) {
-      yield eat(m`elements[]+$: <__CharacterClassElement />`);
+      yield eat(m`elements[]+$: <_CharacterClassElement />`);
     }
 
     yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
   }
 
   *CharacterClassElement() {
-    yield eat(m`<_Any />`, [
+    yield eat(m`<__Any />`, [
       m`<__CharacterSet /\\[dswp]/i />`,
       m`<Gap '\\g' />`,
       m`<*Character />`,
     ]);
 
     if (yield match('-')) {
-      return holdForMatch(m`<CharacterClassRange />`);
+      return shiftMatch(m`<CharacterClassRange />`);
     }
   }
 
@@ -246,7 +229,7 @@ export const grammar = class RegexGrammar {
 
   @CoveredBy('Element')
   *CharacterSet() {
-    yield eat(m`<_Any />`, [
+    yield eat(m`<__Any />`, [
       m`<AnyCharacterSet '.' />`,
       m`<DigitCharacterSet /\\[dD]/  />`,
       m`<SpaceCharacterSet /\\[sS]/  />`,
@@ -300,7 +283,7 @@ export const grammar = class RegexGrammar {
   @UndefinedAttributes(['min', 'max'])
   @Node
   *Quantifier({ ctx }) {
-    yield eat(m`element+$: <__Element />`);
+    yield eat(m`element+$: <_Element />`);
 
     let attrs, sigil;
 
@@ -315,6 +298,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 +341,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.11.0",
   "description": "A BABLR language for nonbacktracking JS-style regexes",
   "engines": {
     "node": ">=12.0.0"
@@ -21,19 +21,19 @@
     "test": "mocha"
   },
   "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",
+    "@babel/runtime": "7.28.2",
+    "@bablr/boot": "0.10.0",
+    "@bablr/helpers": "0.24.0",
+    "@bablr/agast-helpers": "0.9.0",
+    "@bablr/agast-vm-helpers": "0.9.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",
-    "bablr": "^0.7.0",
+    "bablr": "^0.10.0",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.47.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",