@bablr/language-en-json 0.12.0 → 0.13.0

package/lib/grammar.js

@@ -1,222 +1,229 @@
-/* @macrome
- * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#eb47e9a464d603cac4f3c0b96efeefd4b1e2ab7d
- * 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, _ExpressionDecs, _ArrayDecs, _ObjectDecs, _StringDecs, _NumberDecs, _InfinityDecs, _BooleanDecs, _NullDecs, _KeywordDecs, _PunctuatorDecs, _ListDecs, _AnyDecs, _AllDecs;
 import { re, spam as m } from '@bablr/boot';
-import { basicTriviaEnhancer } from '@bablr/helpers/trivia';
 import * as productions from '@bablr/helpers/productions';
-import { o, eat, eatMatch, match, fail, defineAttribute } from '@bablr/helpers/grammar';
+import {
+  o,
+  eat,
+  eatMatch,
+  match,
+  fail,
+  defineAttribute,
+  startSpan,
+  endSpan,
+} from '@bablr/helpers/grammar';
 import { buildString } from '@bablr/helpers/builders';
-import { Node, CoveredBy, AllowEmpty, InjectFrom, Literal } from '@bablr/helpers/decorators';
-import * as Space from '@bablr/language-en-blank-space';
-export const dependencies = {
-  Space
-};
+import Space from '@bablr/language-en-blank-space';
+import { get, printSource } from '@bablr/agast-helpers/tree';
+
+export const dependencies = { Space };
+
 export const canonicalURL = 'https://bablr.org/languages/core/en/json';
+
 export const defaultMatcher = m`<_Expression />`;
-const escapables = new Map(Object.entries({
-  b: '\b',
-  // these two escapes are antiquated
-  f: '\f',
-  // but giving their meaning away could be confusing
-  n: '\n',
-  r: '\r',
-  t: '\t',
-  0: '\0'
-}));
-function first(iter) {
-  for (let value of iter) return value;
+
+const escapables = new Map(
+  Object.entries({
+    b: '\b', // these two escapes are antiquated
+    f: '\f', // but giving their meaning away could be confusing
+    n: '\n',
+    r: '\r',
+    t: '\t',
+    0: '\0',
+  }),
+);
+
+export function* eatMatchTrivia() {
+  let trivia = null;
+  while (yield match(re`/[ \t\r\n]/`)) {
+    trivia = yield eat(m`#: :Space: <_Blank />`);
+  }
+  return trivia;
 }
-export const grammar = basicTriviaEnhancer({
-  triviaIsAllowed: s => s.span === 'Bare',
-  triviaMatcher: m`#: :Space: <*Space /[ \n\r\t]/ />`
-}, class JSONGrammar {
-  static {
-    [_initProto] = _applyDecs(this, [[_ExpressionDecs, 2, "Expression"], [_ArrayDecs, 2, "Array"], [_ObjectDecs, 2, "Object"], [Node, 2, "Property"], [_StringDecs, 2, "String"], [[AllowEmpty, Node], 2, "StringContent"], [Node, 2, "EscapeSequence"], [Node, 2, "EscapeCode"], [_NumberDecs, 2, "Number"], [Node, 2, "Integer"], [Node, 2, "UnsignedInteger"], [Node, 2, "UnsignedHexInteger"], [_InfinityDecs, 2, "Infinity"], [_BooleanDecs, 2, "Boolean"], [_NullDecs, 2, "Null"], [_KeywordDecs, 2, "Keyword"], [_PunctuatorDecs, 2, "Punctuator"], [_ListDecs, 2, "List"], [_AnyDecs, 2, "Any"], [_AllDecs, 2, "All"]], []).e;
-  }
+
+export const fragmentProduction = 'Fragment';
+
+export const grammar = class JSONGrammar {
   constructor() {
-    _initProto(this);
+    this.emptyables = new Set(['StringContent', 'List']);
+    this.literals = new Set(['Keyword']);
   }
-  *[(_ExpressionDecs = CoveredBy('Element'), _ArrayDecs = [CoveredBy('Expression'), Node], _ObjectDecs = [CoveredBy('Expression'), Node], _StringDecs = [CoveredBy('Expression'), Node], _NumberDecs = [CoveredBy('Expression'), Node], _InfinityDecs = [CoveredBy('Expression'), Node], _BooleanDecs = [CoveredBy('Expression'), Node], _NullDecs = [CoveredBy('Expression'), Node], _KeywordDecs = [Literal, Node, InjectFrom(productions)], _PunctuatorDecs = [Literal, Node, InjectFrom(productions)], _ListDecs = [AllowEmpty, InjectFrom(productions)], _AnyDecs = InjectFrom(productions), _AllDecs = InjectFrom(productions), Symbol.for('@bablr/fragment'))]({
-    props: {
-      rootMatcher
-    }
-  }) {
-    // needed for the trivia plugin
+
+  *Fragment({ props: { rootMatcher } }) {
+    yield* eatMatchTrivia();
     yield eat(rootMatcher);
+    yield* eatMatchTrivia();
   }
+
   *Expression() {
-    yield eat(m`<__Any />`, [m`<Array '[' />`, m`<Object '{' />`, m`<String /['"]/ />`, m`<Number /\d|-[\d\g]/ {span: 'Number'} />`, m`<Infinity /-?Infinity/ />`, m`<Null 'null' />`, m`<Boolean /true|false/ />`]);
+    if (yield eatMatch(m`<Array '[' />`)) {
+    } else if (yield eatMatch(m`<Object '{' />`)) {
+    } else if (yield eatMatch(m`<String /['"]/ />`)) {
+    } else if (yield eatMatch(m`<Number /\d|-[\d\g]/ />`)) {
+    } else if (yield eatMatch(m`<Null 'null' />`)) {
+    } else {
+      yield eatMatch(m`<Boolean /true|false/ />`);
+    }
   }
+
   *Array() {
-    yield eat(m`openToken: <*Punctuator '[' { balanced: ']' } />`);
-    yield eat(m`<__List />`, o({
-      element: m`elements[]+$: <_Expression />`,
-      separator: m`#separatorTokens[]: <*Punctuator ',' />`,
-      allowTrailingSeparator: false
-    }));
-    yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
+    yield eat(m`openToken*: <* '[' />`);
+    yield* eatMatchTrivia();
+    let sep = true;
+
+    while (sep && (yield match(re`/[^\]]/s`))) {
+      yield eat(m`elements[]$: <_Expression />`);
+      yield* eatMatchTrivia();
+      sep = yield eatMatch(m`#separatorTokens: <* ',' />`);
+      if (sep) {
+        yield* eatMatchTrivia();
+      }
+    }
+    yield eat(m`closeToken*: <* ']' />`);
   }
+
   *Object() {
-    yield eat(m`openToken: <*Punctuator '{' { balanced: '}' } />`);
+    yield eat(m`openToken*: <* '{' />`);
+    yield* eatMatchTrivia();
     let sep = true;
-    yield eatMatch(m`#separatorTokens[]: []`);
-    yield eatMatch(m`properties[]$: []`);
-    while (sep && (yield match(re`/.|\g/s`))) {
-      let suppressGap = !!(yield match(m`<__All />`, [m`key: <//>`, m`sigilToken: <*Punctuator ':' />`]));
-      yield eat(m`properties[]$: <Property />`, null, o({
-        suppressGap
-      }));
-      sep = yield eatMatch(m`#separatorTokens[]: <*Punctuator ',' />`);
+
+    while (sep && (yield match(re`/[^}]/s`))) {
+      yield match(m`<__All />`, [m`key$: <//>`, m`sigilToken*: <* ':' />`]);
+      yield eat(m`properties[]$: <Property />`);
+      yield* eatMatchTrivia();
+      sep = yield eatMatch(m`#separatorTokens: <* ',' />`);
+      if (sep) {
+        yield* eatMatchTrivia();
+      }
     }
-    yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
+    yield eat(m`closeToken*: <* '}' />`);
   }
+
   *Property() {
     yield eat(m`key$: <String />`);
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
+    yield* eatMatchTrivia();
+    yield eat(m`sigilToken*: <* ':' />`);
+    yield* eatMatchTrivia();
     yield eat(m`value+$: <_Expression />`);
   }
+
   *String() {
-    yield eat(m`openToken: <*Punctuator '"' { balanced: '"', balancedSpan: 'String:Double' } />`);
+    yield eat(m`openToken*: <* '"' />`);
+    yield startSpan('String:Double', '"');
     yield eat(m`content$: <*StringContent />`);
-    yield eat(m`closeToken: <*Punctuator '"' { balancer: true } />`);
+    yield endSpan();
+    yield eat(m`closeToken*: <* '"' />`);
   }
-  *StringContent({
-    state: {
-      span
-    }
-  }) {
+
+  *StringContent() {
     let esc, lit;
     do {
-      esc = (yield match('\\')) && (yield eat(m`@: <EscapeSequence />`));
-      lit = span === 'String:Single' ? yield eatMatch(re`/[^\r\n\\'\g]+/`) : yield eatMatch(re`/[^\r\n\\"\g]+/`);
+      lit = yield eatMatch(re`/[^\r\n\\\g]+/`);
+      esc = yield eatMatch(m`@: <EscapeSequence '\\' />`);
     } while (esc || lit);
   }
-  *EscapeSequence({
-    state: {
-      span
-    },
-    ctx
-  }) {
-    if (!span.startsWith('String')) {
-      yield fail();
-    }
-    yield eat(m`sigilToken: <*Punctuator '\\' { openSpan: 'Escape' } />`);
+
+  *EscapeSequence() {
+    yield startSpan('Escape');
+    yield eat(m`sigilToken*: <* '\\' />`);
+
     let match_;
     let cooked;
-    if (match_ = span === 'String:Single' ? yield match(re`/[\\/bfnrt0']/`) : yield match(re`/[\\/bfnrt0"]/`)) {
-      const matchText = ctx.sourceTextFor(match_);
-      yield eat(m`code: <*Keyword ${buildString(matchText)} { closeSpan: 'Escape' } />`);
+
+    if ((match_ = yield match(re`/[\\/bfnrt0"]/`))) {
+      const matchText = printSource(match_);
+      yield eat(m`code*: <*Keyword ${buildString(matchText)} />`);
+
       cooked = escapables.get(matchText) || matchText;
     } else if (yield match('u')) {
-      let codeNode = yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
-      const type = ctx.sourceTextFor(codeNode.get('typeToken'));
+      let codeNode = yield eat(m`code*: <EscapeCode />`);
+
+      const type = printSource(get('typeToken', codeNode.node));
+
       if (type) {
-        const value = ctx.sourceTextFor(codeNode.get('value'));
-        if (!span.startsWith('String')) {
-          throw new Error('not implemented');
-        }
+        const value = printSource(get('value', codeNode.node));
+
         if (type === 'u') {
           cooked = String.fromCharCode(parseInt(value, 16));
         } else {
           throw new Error();
         }
       } else {
-        let value = ctx.sourceTextFor(codeNode);
+        let value = printSource(codeNode.node);
         cooked = escapables.get(value) || value;
       }
     } else {
       yield fail();
     }
+
+    // TODO error if we don't see the span ended
+    yield endSpan();
+
     yield defineAttribute('cooked', cooked);
   }
+
   *EscapeCode() {
-    if (yield eatMatch(m`typeToken: <*Keyword 'u' />`)) {
-      if (yield eatMatch(m`openToken: <*Punctuator '{' { balanced: '}' } />`, null, o({
-        bind: true
-      }))) {
-        yield eat(m`value$: <*UnsignedHexInteger />`);
-        yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
+    if (yield eatMatch(m`typeToken*: <*Keyword 'u' />`)) {
+      if (yield eatMatch(m`openToken*: <* '{' />`)) {
+        yield* eatMatchTrivia();
+        yield eat(m`value: <*UnsignedHexInteger />`);
+        yield* eatMatchTrivia();
+        yield eat(m`closeToken*: <* '}' />`);
       } else {
-        yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{4}/ />`);
-        yield eat(m`closeToken: null`);
+        yield eat(m`value: <*UnsignedHexInteger /[\da-fA-F]{4}/ />`);
       }
     }
   }
+
   *Number() {
-    yield eat(m`wholePart$: <Integer />`, o({
-      noDoubleZero: true,
-      matchSign: '-'
-    }));
-    let fs = yield eatMatch(m`fractionalSeparatorToken: <*Punctuator '.' />`, null, o({
-      bind: true
-    }));
+    yield eat(m`wholePart$: <Integer />`, o({ noDoubleZero: true, matchSign: '-' }));
+
+    let fs = yield eatMatch(m`fractionalSeparatorToken*: <* '.' />`);
+
     if (fs) {
       yield eat(m`fractionalPart$: <*UnsignedInteger />`);
     } else {
       yield eat(m`fractionalPart$: null`);
     }
-    let es = yield eatMatch(m`exponentSeparatorToken: <*Punctuator /[eE]/ />`, null, o({
-      bind: true
-    }));
+
+    let es = yield eatMatch(m`exponentSeparatorToken*: <* /[eE]/ />`);
+
     if (es) {
-      yield eat(m`exponentPart$: <Integer />`, {
-        matchSign: /[+-]/
-      });
+      yield eat(m`exponentPart$: <Integer />`, { matchSign: /[+-]/ });
     } else {
       yield eat(m`exponentPart$: null`);
     }
   }
-  *Integer({
-    props: {
-      matchSign = null,
-      noDoubleZero = false
-    }
-  }) {
+
+  *Integer({ props: { matchSign = null, noDoubleZero = false } }) {
     if (matchSign) {
-      yield eatMatch(m`signToken: <*Punctuator ${buildString(matchSign)} />`, null, o({
-        bind: true
-      }));
-    } else {
-      yield eat(m`signToken: null`);
+      yield eatMatch(m`signToken*: <* ${buildString(matchSign)} />`);
     }
-    yield eat(m`value$: <*UnsignedInteger />`, o({
-      noDoubleZero
-    }));
-  }
-  *UnsignedInteger({
-    props: {
-      noDoubleZero = false
-    },
-    ctx
-  }) {
-    let firstDigit = ctx.sourceTextFor(yield eat(re`/\d/`));
+
+    yield eat(m`value$: <*UnsignedInteger />`, o({ noDoubleZero }));
+  }
+
+  *UnsignedInteger({ props: { noDoubleZero = false } }) {
+    let firstDigit = printSource(yield eat(re`/\d/`));
+
     if (!noDoubleZero || firstDigit.value !== '0') {
       yield eatMatch(re`/\d+/`);
     }
   }
+
   *UnsignedHexInteger() {
     yield eatMatch(re`/[\da-fA-F]+/`);
   }
-  *Infinity() {
-    yield eatMatch(m`signToken: <*Punctuator '-' />`, null, o({
-      bind: true
-    }));
-    yield eat(m`sigilToken: <*Keyword 'Infinity' />`);
-  }
+
   *Boolean() {
-    yield eat(m`sigilToken: <*Keyword /true|false/ />`);
+    yield eat(m`sigilToken*: <*Keyword /true|false/ />`);
   }
+
   *Null() {
-    yield eat(m`sigilToken: <*Keyword 'null' />`);
-  }
-  *Keyword() {}
-  *Punctuator() {}
-  *List() {}
-  *Any() {}
-  *All() {}
-});
+    yield eat(m`sigilToken*: <*Keyword 'null' />`);
+  }
+
+  All(args) {
+    return productions.All(args);
+  }
+};
+
+export default { canonicalURL, dependencies, grammar, defaultMatcher, fragmentProduction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-json",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "A BABLR language for JSON",
   "engines": {
     "node": ">=12.0.0"
@@ -14,26 +14,20 @@
     "lib/**/*.js"
   ],
   "scripts": {
-    "build": "macrome build",
-    "watch": "macrome watch",
-    "clean": "macrome clean",
     "test": "mocha"
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.9.0",
-    "@bablr/agast-vm-helpers": "0.9.0",
-    "@bablr/boot": "0.10.0",
-    "@bablr/helpers": "0.24.0",
-    "@bablr/language-en-blank-space": "0.9.0",
-    "@babel/runtime": "7.28.2"
+    "@bablr/agast-helpers": "0.10.0",
+    "@bablr/agast-vm-helpers": "0.10.0",
+    "@bablr/boot": "0.11.0",
+    "@bablr/helpers": "0.25.0",
+    "@bablr/language-en-blank-space": "0.10.0"
   },
   "devDependencies": {
     "@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.10.0",
+    "bablr": "^0.11.0",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",
@@ -48,7 +42,10 @@
     "grammar",
     "english"
   ],
-  "repository": "git@github.com:bablr-lang/language-en-json.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/bablr-lang/language-en-json.git"
+  },
   "homepage": "https://github.com/bablr-lang/language-en-json",
   "author": "Conrad Buck <conartist6@gmail.com>",
   "license": "MIT"

package/lib/grammar.macro.js

@@ -1,285 +0,0 @@
-import { re, spam as m } from '@bablr/boot';
-import { basicTriviaEnhancer } from '@bablr/helpers/trivia';
-import * as productions from '@bablr/helpers/productions';
-import { o, eat, eatMatch, match, fail, defineAttribute } from '@bablr/helpers/grammar';
-import { buildString } from '@bablr/helpers/builders';
-import { Node, CoveredBy, AllowEmpty, InjectFrom, Literal } from '@bablr/helpers/decorators';
-import * as Space from '@bablr/language-en-blank-space';
-
-export const dependencies = { Space };
-
-export const canonicalURL = 'https://bablr.org/languages/core/en/json';
-
-export const defaultMatcher = m`<_Expression />`;
-
-const escapables = new Map(
-  Object.entries({
-    b: '\b', // these two escapes are antiquated
-    f: '\f', // but giving their meaning away could be confusing
-    n: '\n',
-    r: '\r',
-    t: '\t',
-    0: '\0',
-  }),
-);
-
-function first(iter) {
-  for (let value of iter) return value;
-}
-
-export const grammar = basicTriviaEnhancer(
-  {
-    triviaIsAllowed: (s) => s.span === 'Bare',
-    triviaMatcher: m`#: :Space: <*Space /[ \n\r\t]/ />`,
-  },
-  class JSONGrammar {
-    *[Symbol.for('@bablr/fragment')]({ props: { rootMatcher } }) {
-      // needed for the trivia plugin
-      yield eat(rootMatcher);
-    }
-
-    @CoveredBy('Element')
-    *Expression() {
-      yield eat(m`<__Any />`, [
-        m`<Array '[' />`,
-        m`<Object '{' />`,
-        m`<String /['"]/ />`,
-        m`<Number /\d|-[\d\g]/ {span: 'Number'} />`,
-        m`<Infinity /-?Infinity/ />`,
-        m`<Null 'null' />`,
-        m`<Boolean /true|false/ />`,
-      ]);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Array() {
-      yield eat(m`openToken: <*Punctuator '[' { balanced: ']' } />`);
-      yield eat(
-        m`<__List />`,
-        o({
-          element: m`elements[]+$: <_Expression />`,
-          separator: m`#separatorTokens[]: <*Punctuator ',' />`,
-          allowTrailingSeparator: false,
-        }),
-      );
-      yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Object() {
-      yield eat(m`openToken: <*Punctuator '{' { balanced: '}' } />`);
-      let sep = true;
-
-      yield eatMatch(m`#separatorTokens[]: []`);
-      yield eatMatch(m`properties[]$: []`);
-
-      while (sep && (yield match(re`/.|\g/s`))) {
-        let suppressGap = !!(yield match(m`<__All />`, [
-          m`key: <//>`,
-          m`sigilToken: <*Punctuator ':' />`,
-        ]));
-        yield eat(m`properties[]$: <Property />`, null, o({ suppressGap }));
-        sep = yield eatMatch(m`#separatorTokens[]: <*Punctuator ',' />`);
-      }
-      yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
-    }
-
-    @Node
-    *Property() {
-      yield eat(m`key$: <String />`);
-      yield eat(m`sigilToken: <*Punctuator ':' />`);
-      yield eat(m`value+$: <_Expression />`);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *String() {
-      yield eat(m`openToken: <*Punctuator '"' { balanced: '"', balancedSpan: 'String:Double' } />`);
-
-      yield eat(m`content$: <*StringContent />`);
-
-      yield eat(m`closeToken: <*Punctuator '"' { balancer: true } />`);
-    }
-
-    @AllowEmpty
-    @Node
-    *StringContent({ state: { span } }) {
-      let esc, lit;
-      do {
-        esc = (yield match('\\')) && (yield eat(m`@: <EscapeSequence />`));
-        lit =
-          span === 'String:Single'
-            ? yield eatMatch(re`/[^\r\n\\'\g]+/`)
-            : yield eatMatch(re`/[^\r\n\\"\g]+/`);
-      } while (esc || lit);
-    }
-
-    @Node
-    *EscapeSequence({ state: { span }, ctx }) {
-      if (!span.startsWith('String')) {
-        yield fail();
-      }
-
-      yield eat(m`sigilToken: <*Punctuator '\\' { openSpan: 'Escape' } />`);
-
-      let match_;
-      let cooked;
-
-      if (
-        (match_ =
-          span === 'String:Single'
-            ? yield match(re`/[\\/bfnrt0']/`)
-            : yield match(re`/[\\/bfnrt0"]/`))
-      ) {
-        const matchText = ctx.sourceTextFor(match_);
-        yield eat(m`code: <*Keyword ${buildString(matchText)} { closeSpan: 'Escape' } />`);
-
-        cooked = escapables.get(matchText) || matchText;
-      } else if (yield match('u')) {
-        let codeNode = yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
-
-        const type = ctx.sourceTextFor(codeNode.get('typeToken'));
-
-        if (type) {
-          const value = ctx.sourceTextFor(codeNode.get('value'));
-
-          if (!span.startsWith('String')) {
-            throw new Error('not implemented');
-          }
-
-          if (type === 'u') {
-            cooked = String.fromCharCode(parseInt(value, 16));
-          } else {
-            throw new Error();
-          }
-        } else {
-          let value = ctx.sourceTextFor(codeNode);
-          cooked = escapables.get(value) || value;
-        }
-      } else {
-        yield fail();
-      }
-
-      yield defineAttribute('cooked', cooked);
-    }
-
-    @Node
-    *EscapeCode() {
-      if (yield eatMatch(m`typeToken: <*Keyword 'u' />`)) {
-        if (
-          yield eatMatch(
-            m`openToken: <*Punctuator '{' { balanced: '}' } />`,
-            null,
-            o({ bind: true }),
-          )
-        ) {
-          yield eat(m`value$: <*UnsignedHexInteger />`);
-          yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
-        } else {
-          yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{4}/ />`);
-          yield eat(m`closeToken: null`);
-        }
-      }
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Number() {
-      yield eat(m`wholePart$: <Integer />`, o({ noDoubleZero: true, matchSign: '-' }));
-
-      let fs = yield eatMatch(
-        m`fractionalSeparatorToken: <*Punctuator '.' />`,
-        null,
-        o({ bind: true }),
-      );
-
-      if (fs) {
-        yield eat(m`fractionalPart$: <*UnsignedInteger />`);
-      } else {
-        yield eat(m`fractionalPart$: null`);
-      }
-
-      let es = yield eatMatch(
-        m`exponentSeparatorToken: <*Punctuator /[eE]/ />`,
-        null,
-        o({ bind: true }),
-      );
-
-      if (es) {
-        yield eat(m`exponentPart$: <Integer />`, { matchSign: /[+-]/ });
-      } else {
-        yield eat(m`exponentPart$: null`);
-      }
-    }
-
-    @Node
-    *Integer({ props: { matchSign = null, noDoubleZero = false } }) {
-      if (matchSign) {
-        yield eatMatch(
-          m`signToken: <*Punctuator ${buildString(matchSign)} />`,
-          null,
-          o({ bind: true }),
-        );
-      } else {
-        yield eat(m`signToken: null`);
-      }
-
-      yield eat(m`value$: <*UnsignedInteger />`, o({ noDoubleZero }));
-    }
-
-    @Node
-    *UnsignedInteger({ props: { noDoubleZero = false }, ctx }) {
-      let firstDigit = ctx.sourceTextFor(yield eat(re`/\d/`));
-
-      if (!noDoubleZero || firstDigit.value !== '0') {
-        yield eatMatch(re`/\d+/`);
-      }
-    }
-
-    @Node
-    *UnsignedHexInteger() {
-      yield eatMatch(re`/[\da-fA-F]+/`);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Infinity() {
-      yield eatMatch(m`signToken: <*Punctuator '-' />`, null, o({ bind: true }));
-      yield eat(m`sigilToken: <*Keyword 'Infinity' />`);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Boolean() {
-      yield eat(m`sigilToken: <*Keyword /true|false/ />`);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Null() {
-      yield eat(m`sigilToken: <*Keyword 'null' />`);
-    }
-
-    @Literal
-    @Node
-    @InjectFrom(productions)
-    *Keyword() {}
-
-    @Literal
-    @Node
-    @InjectFrom(productions)
-    *Punctuator() {}
-
-    @AllowEmpty
-    @InjectFrom(productions)
-    *List() {}
-
-    @InjectFrom(productions)
-    *Any() {}
-
-    @InjectFrom(productions)
-    *All() {}
-  },
-);