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

package/lib/grammar.js

@@ -1,16 +1,16 @@
 /* @macrome
  * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#0f254bf8ccce6de1ebde89020c7430dc4259e311
+ * @generatedfrom ./grammar.macro.js#668869863dcbbe5d7e42f8cae9451aa4d70fbf6e
  * This file is autogenerated. Please do not edit it directly.
  * When editing run `npx macrome watch` then change the file this is generated from.
  */
 import _applyDecs from "@babel/runtime/helpers/applyDecs2305";
 let _initProto, _FlagsDecs, _GroupDecs, _AssertionDecs, _StartOfInputAssertionDecs, _EndOfInputAssertionDecs, _WordBoundaryAssertionDecs, _GapDecs, _CharacterDecs, _CharacterClassDecs, _CharacterClassRangeDecs, _CharacterSetDecs, _AnyCharacterSetDecs, _DigitCharacterSetDecs, _SpaceCharacterSetDecs, _WordCharacterSetDecs, _QuantifierDecs, _AnyDecs, _KeywordDecs, _PunctuatorDecs;
 import { re, spam as m } from '@bablr/boot';
-import { Node, CoveredBy, InjectFrom, UnboundAttributes, AllowEmpty } from '@bablr/helpers/decorators';
+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, bindAttribute, fail } from '@bablr/helpers/grammar';
+import { eat, eatMatch, match, holdForMatch, 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 = {};
@@ -55,14 +55,14 @@ const getSpecialPattern = span => {
 };
 export const grammar = class RegexGrammar {
   static {
-    [_initProto] = _applyDecs(this, [[Node, 2, "Pattern"], [_FlagsDecs, 2, "Flags"], [AllowEmpty, 2, "Alternatives"], [[AllowEmpty, Node], 2, "Alternative"], [AllowEmpty, 2, "Elements"], [_GroupDecs, 2, "Group"], [Node, 2, "CapturingGroup"], [_AssertionDecs, 2, "Assertion"], [_StartOfInputAssertionDecs, 2, "StartOfInputAssertion"], [_EndOfInputAssertionDecs, 2, "EndOfInputAssertion"], [_WordBoundaryAssertionDecs, 2, "WordBoundaryAssertion"], [_GapDecs, 2, "Gap"], [_CharacterDecs, 2, "Character"], [_CharacterClassDecs, 2, "CharacterClass"], [_CharacterClassRangeDecs, 2, "CharacterClassRange"], [_CharacterSetDecs, 2, "CharacterSet"], [_AnyCharacterSetDecs, 2, "AnyCharacterSet"], [_DigitCharacterSetDecs, 2, "DigitCharacterSet"], [_SpaceCharacterSetDecs, 2, "SpaceCharacterSet"], [_WordCharacterSetDecs, 2, "WordCharacterSet"], [_QuantifierDecs, 2, "Quantifier"], [Node, 2, "UnsignedInteger"], [Node, 2, "EscapeSequence"], [Node, 2, "EscapeCode"], [Node, 2, "Digit"], [_AnyDecs, 2, "Any"], [_KeywordDecs, 2, "Keyword"], [_PunctuatorDecs, 2, "Punctuator"]], []).e;
+    [_initProto] = _applyDecs(this, [[Node, 2, "Pattern"], [_FlagsDecs, 2, "Flags"], [AllowEmpty, 2, "Alternatives"], [[AllowEmpty, Node], 2, "Alternative"], [AllowEmpty, 2, "Elements"], [_GroupDecs, 2, "Group"], [Node, 2, "CapturingGroup"], [_AssertionDecs, 2, "Assertion"], [_StartOfInputAssertionDecs, 2, "StartOfInputAssertion"], [_EndOfInputAssertionDecs, 2, "EndOfInputAssertion"], [_WordBoundaryAssertionDecs, 2, "WordBoundaryAssertion"], [_GapDecs, 2, "Gap"], [_CharacterDecs, 2, "Character"], [_CharacterClassDecs, 2, "CharacterClass"], [_CharacterClassRangeDecs, 2, "CharacterClassRange"], [_CharacterSetDecs, 2, "CharacterSet"], [_AnyCharacterSetDecs, 2, "AnyCharacterSet"], [_DigitCharacterSetDecs, 2, "DigitCharacterSet"], [_SpaceCharacterSetDecs, 2, "SpaceCharacterSet"], [_WordCharacterSetDecs, 2, "WordCharacterSet"], [_QuantifierDecs, 2, "Quantifier"], [Node, 2, "UnsignedInteger"], [Node, 2, "UnsignedHexInteger"], [Node, 2, "EscapeSequence"], [Node, 2, "EscapeCode"], [Node, 2, "Digit"], [_AnyDecs, 2, "Any"], [_KeywordDecs, 2, "Keyword"], [_PunctuatorDecs, 2, "Punctuator"]], []).e;
   }
   constructor() {
     _initProto(this);
   }
-  *[(_FlagsDecs = [UnboundAttributes(Object.keys(flagCharacters)), AllowEmpty, Node], _GroupDecs = [CoveredBy('Element'), Node], _AssertionDecs = CoveredBy('Element'), _StartOfInputAssertionDecs = [CoveredBy('Assertion'), Node], _EndOfInputAssertionDecs = [CoveredBy('Assertion'), Node], _WordBoundaryAssertionDecs = [UnboundAttributes(['negate']), CoveredBy('Assertion'), Node], _GapDecs = [CoveredBy('Assertion'), Node], _CharacterDecs = [CoveredBy('Element'), CoveredBy('CharacterClassElement'), Node], _CharacterClassDecs = [UnboundAttributes(['negate']), CoveredBy('Element'), Node], _CharacterClassRangeDecs = [CoveredBy('CharacterClassElement'), Node], _CharacterSetDecs = CoveredBy('Element'), _AnyCharacterSetDecs = [CoveredBy('CharacterSet'), Node], _DigitCharacterSetDecs = [UnboundAttributes(['negate']), CoveredBy('CharacterSet'), Node], _SpaceCharacterSetDecs = [UnboundAttributes(['negate']), CoveredBy('CharacterSet'), Node], _WordCharacterSetDecs = [UnboundAttributes(['negate']), CoveredBy('CharacterSet'), Node], _QuantifierDecs = [UnboundAttributes(['min', 'max']), Node], _AnyDecs = InjectFrom(Shared), _KeywordDecs = [Node, InjectFrom(Shared)], _PunctuatorDecs = [Node, InjectFrom(Shared)], "Pattern")]() {
+  *[(_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 />`);
   }
@@ -77,9 +77,9 @@ export const grammar = class RegexGrammar {
       1: chr
     } of Object.entries(flagCharacters)) {
       if (flagsStr.includes(chr)) {
-        yield bindAttribute(name, true);
+        yield defineAttribute(name, true);
       } else {
-        yield bindAttribute(name, false);
+        yield defineAttribute(name, false);
       }
     }
     for (const flagChr of flagsStr) {
@@ -92,33 +92,33 @@ export const grammar = class RegexGrammar {
     } 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 />`);
     }
   }
   *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 +131,7 @@ export const grammar = class RegexGrammar {
   }) {
     yield eatMatch(m`escapeToken: <*Punctuator '\\' />`);
     const m_ = yield eat(m`value: <*Keyword /b/i />`);
-    yield bindAttribute('negate', buildBoolean(ctx.sourceTextFor(m_) === 'B'));
+    yield defineAttribute('negate', buildBoolean(ctx.sourceTextFor(m_) === 'B'));
   }
   *Gap() {
     yield eatMatch(m`escapeToken: <*Punctuator '\\' />`);
@@ -146,15 +146,17 @@ export const grammar = class RegexGrammar {
   }
   *CharacterClass() {
     yield eat(m`openToken: <*Punctuator '[' { balancedSpan: 'CharacterClass', balanced: ']' } />`);
-    let negate = yield eatMatch(m`negateToken: <*Keyword '^' />`);
-    yield bindAttribute('negate', !!negate);
+    let negate = yield eatMatch(m`negateToken: <*Keyword '^' />`, null, o({
+      bind: true
+    }));
+    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 />`);
     }
@@ -165,7 +167,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 '.' />`);
@@ -175,26 +177,26 @@ export const grammar = class RegexGrammar {
   }) {
     yield eat(m`escapeToken: <*Punctuator '\\' />`);
     let code = yield eat(m`value: <*Keyword /[dD]/ />`);
-    yield bindAttribute('negate', buildBoolean(ctx.sourceTextFor(code) === 'D'));
+    yield defineAttribute('negate', ctx.sourceTextFor(code) === 'D');
   }
   *SpaceCharacterSet({
     ctx
   }) {
     yield eat(m`escapeToken: <*Punctuator '\\' />`);
     let code = yield eat(m`value: <*Keyword /[sS]/ />`);
-    yield bindAttribute('negate', buildBoolean(ctx.sourceTextFor(code) === 'S'));
+    yield defineAttribute('negate', ctx.sourceTextFor(code) === 'S');
   }
   *WordCharacterSet({
     ctx
   }) {
     yield eat(m`escapeToken: <*Punctuator '\\' />`);
     let code = yield eat(m`value: <*Keyword /[wW]/ />`);
-    yield bindAttribute('negate', ctx.sourceTextFor(code) === 'W');
+    yield defineAttribute('negate', ctx.sourceTextFor(code) === 'W');
   }
   *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)) {
@@ -233,16 +235,18 @@ export const grammar = class RegexGrammar {
       };
       yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
     }
-    yield bindAttribute('min', attrs.min);
-    yield bindAttribute('max', attrs.max);
+    yield defineAttribute('min', attrs.min);
+    yield defineAttribute('max', attrs.max);
   }
   *UnsignedInteger() {
     yield eat(re`/\d+/`);
   }
+  *UnsignedHexInteger() {
+    yield eat(re`/[\da-fA-F]+/`);
+  }
   *EscapeSequence({
     state,
-    ctx,
-    value: props
+    ctx
   }) {
     const parentSpan = state.span;
     yield eat(m`escape: <*Punctuator '\\' { openSpan: 'Escape' } />`);
@@ -262,15 +266,15 @@ export const grammar = class RegexGrammar {
   *EscapeCode() {
     if (yield eatMatch(m`type: <*Keyword 'u' />`)) {
       if (yield eatMatch(m`openToken: <*Punctuator '{' />`)) {
-        yield eatMatch(m`value$: <*UnsignedInteger />`);
+        yield eatMatch(m`value$: <*UnsignedHexInteger />`);
         yield eat(m`closeToken: <*Punctuator '}' />`);
       } else {
-        yield eat(m`value$: <*UnsignedInteger /\d{4}/ />`);
+        yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{4}/ />`);
         yield eat(m`closeToken: null`);
       }
     } else if (yield eatMatch(m`type: <*Keyword 'x' />`)) {
       yield eat(m`openToken: null`);
-      yield eat(m`value$: <*UnsignedInteger /\d{2}/ />`);
+      yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{2}/ />`);
       yield eat(m`closeToken: null`);
     }
   }

package/lib/grammar.macro.js

@@ -3,8 +3,9 @@ import {
   Node,
   CoveredBy,
   InjectFrom,
-  UnboundAttributes,
+  UndefinedAttributes,
   AllowEmpty,
+  Literal,
 } from '@bablr/helpers/decorators';
 import objectEntries from 'iter-tools-es/methods/object-entries';
 import * as Shared from '@bablr/helpers/productions';
@@ -14,8 +15,9 @@ import {
   match,
   holdForMatch,
   guard,
-  bindAttribute,
+  defineAttribute,
   fail,
+  o,
 } from '@bablr/helpers/grammar';
 import { buildString, buildBoolean } from '@bablr/helpers/builders';
 
@@ -76,12 +78,12 @@ 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 />`);
   }
 
-  @UnboundAttributes(Object.keys(flagCharacters))
+  @UndefinedAttributes(Object.keys(flagCharacters))
   @AllowEmpty
   @Node
   *Flags({ ctx }) {
@@ -93,9 +95,9 @@ export const grammar = class RegexGrammar {
 
     for (const { 0: name, 1: chr } of Object.entries(flagCharacters)) {
       if (flagsStr.includes(chr)) {
-        yield bindAttribute(name, true);
+        yield defineAttribute(name, true);
       } else {
-        yield bindAttribute(name, false);
+        yield defineAttribute(name, false);
       }
     }
 
@@ -114,26 +116,26 @@ export const grammar = class RegexGrammar {
   @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 />`,
+      m`<__Assertion /[$^]|\\b/i />`,
       m`<Gap '\\g' />`,
-      m`<CharacterSet /\.|\\[dswp]/i />`,
+      m`<__CharacterSet /\.|\\[dswp]/i />`,
       m`<*Character />`,
     ]);
 
@@ -146,20 +148,20 @@ 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 />`, [
+    yield eat(m`<_Any />`, [
       m`<*StartOfInputAssertion '^' />`,
       m`<*EndOfInputAssertion '$' />`,
       m`<*WordBoundaryAssertion /\\b/i />`,
@@ -178,13 +180,13 @@ export const grammar = class RegexGrammar {
     yield eatMatch(m`sigilToken: <*Keyword '$' />`);
   }
 
-  @UnboundAttributes(['negate'])
+  @UndefinedAttributes(['negate'])
   @CoveredBy('Assertion')
   @Node
   *WordBoundaryAssertion({ ctx }) {
     yield eatMatch(m`escapeToken: <*Punctuator '\\' />`);
     const m_ = yield eat(m`value: <*Keyword /b/i />`);
-    yield bindAttribute('negate', buildBoolean(ctx.sourceTextFor(m_) === 'B'));
+    yield defineAttribute('negate', buildBoolean(ctx.sourceTextFor(m_) === 'B'));
   }
 
   @CoveredBy('Assertion')
@@ -205,25 +207,29 @@ export const grammar = class RegexGrammar {
     }
   }
 
-  @UnboundAttributes(['negate'])
+  @UndefinedAttributes(['negate'])
   @CoveredBy('Element')
   @Node
   *CharacterClass() {
     yield eat(m`openToken: <*Punctuator '[' { balancedSpan: 'CharacterClass', balanced: ']' } />`);
 
-    let negate = yield eatMatch(m`negateToken: <*Keyword '^' />`);
+    let negate = yield eatMatch(m`negateToken: <*Keyword '^' />`, null, o({ bind: true }));
 
-    yield bindAttribute('negate', !!negate);
+    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 />`);
@@ -240,7 +246,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]/  />`,
@@ -248,13 +254,15 @@ export const grammar = class RegexGrammar {
     ]);
   }
 
+  @CoveredBy('Element')
   @CoveredBy('CharacterSet')
   @Node
   *AnyCharacterSet() {
     yield eat(m`sigilToken: <*Keyword '.' />`);
   }
 
-  @UnboundAttributes(['negate'])
+  @UndefinedAttributes(['negate'])
+  @CoveredBy('Element')
   @CoveredBy('CharacterSet')
   @Node
   *DigitCharacterSet({ ctx }) {
@@ -262,10 +270,11 @@ export const grammar = class RegexGrammar {
 
     let code = yield eat(m`value: <*Keyword /[dD]/ />`);
 
-    yield bindAttribute('negate', buildBoolean(ctx.sourceTextFor(code) === 'D'));
+    yield defineAttribute('negate', ctx.sourceTextFor(code) === 'D');
   }
 
-  @UnboundAttributes(['negate'])
+  @UndefinedAttributes(['negate'])
+  @CoveredBy('Element')
   @CoveredBy('CharacterSet')
   @Node
   *SpaceCharacterSet({ ctx }) {
@@ -273,10 +282,11 @@ export const grammar = class RegexGrammar {
 
     let code = yield eat(m`value: <*Keyword /[sS]/ />`);
 
-    yield bindAttribute('negate', buildBoolean(ctx.sourceTextFor(code) === 'S'));
+    yield defineAttribute('negate', ctx.sourceTextFor(code) === 'S');
   }
 
-  @UnboundAttributes(['negate'])
+  @UndefinedAttributes(['negate'])
+  @CoveredBy('Element')
   @CoveredBy('CharacterSet')
   @Node
   *WordCharacterSet({ ctx }) {
@@ -284,13 +294,13 @@ export const grammar = class RegexGrammar {
 
     let code = yield eat(m`value: <*Keyword /[wW]/ />`);
 
-    yield bindAttribute('negate', ctx.sourceTextFor(code) === 'W');
+    yield defineAttribute('negate', ctx.sourceTextFor(code) === 'W');
   }
 
-  @UnboundAttributes(['min', 'max'])
+  @UndefinedAttributes(['min', 'max'])
   @Node
   *Quantifier({ ctx }) {
-    yield eat(m`element+$: <Element />`);
+    yield eat(m`element+$: <__Element />`);
 
     let attrs, sigil;
 
@@ -325,8 +335,8 @@ export const grammar = class RegexGrammar {
       yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
     }
 
-    yield bindAttribute('min', attrs.min);
-    yield bindAttribute('max', attrs.max);
+    yield defineAttribute('min', attrs.min);
+    yield defineAttribute('max', attrs.max);
   }
 
   @Node
@@ -335,7 +345,12 @@ export const grammar = class RegexGrammar {
   }
 
   @Node
-  *EscapeSequence({ state, ctx, value: props }) {
+  *UnsignedHexInteger() {
+    yield eat(re`/[\da-fA-F]+/`);
+  }
+
+  @Node
+  *EscapeSequence({ state, ctx }) {
     const parentSpan = state.span;
 
     yield eat(m`escape: <*Punctuator '\\' { openSpan: 'Escape' } />`);
@@ -359,15 +374,15 @@ export const grammar = class RegexGrammar {
   *EscapeCode() {
     if (yield eatMatch(m`type: <*Keyword 'u' />`)) {
       if (yield eatMatch(m`openToken: <*Punctuator '{' />`)) {
-        yield eatMatch(m`value$: <*UnsignedInteger />`);
+        yield eatMatch(m`value$: <*UnsignedHexInteger />`);
         yield eat(m`closeToken: <*Punctuator '}' />`);
       } else {
-        yield eat(m`value$: <*UnsignedInteger /\d{4}/ />`);
+        yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{4}/ />`);
         yield eat(m`closeToken: null`);
       }
     } else if (yield eatMatch(m`type: <*Keyword 'x' />`)) {
       yield eat(m`openToken: null`);
-      yield eat(m`value$: <*UnsignedInteger /\d{2}/ />`);
+      yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{2}/ />`);
       yield eat(m`closeToken: null`);
     }
   }
@@ -384,10 +399,12 @@ export const grammar = class RegexGrammar {
   @InjectFrom(Shared)
   *Any() {}
 
+  @Literal
   @Node
   @InjectFrom(Shared)
   *Keyword() {}
 
+  @Literal
   @Node
   @InjectFrom(Shared)
   *Punctuator() {}

package/package.json

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