@bablr/language-en-regex-vm-pattern 0.12.0 → 0.12.2

package/lib/grammar.js

@@ -1,5 +1,4 @@
 import { re, spam as m } from '@bablr/boot';
-import objectEntries from 'iter-tools-es/methods/object-entries';
 import {
   eat,
   eatMatch,
@@ -24,7 +23,7 @@ export const dependencies = {};
 export const defaultMatcher = m`<Pattern />`;
 
 const escapables = new Map(
-  objectEntries({
+  Object.entries({
     n: '\n',
     r: '\r',
     t: '\t',
@@ -132,13 +131,17 @@ export const grammar = class RegexGrammar {
 
   *Group() {
     yield eat(m`openToken*: <* '(?:' />`);
+    yield startSpan('Pattern', ')');
     yield eat(m`<__Alternatives />`);
+    yield endSpan();
     yield eat(m`closeToken*: <* ')' />`);
   }
 
   *CapturingGroup() {
     yield eat(m`openToken*: <* '(' />`);
+    yield startSpan('Pattern', ')');
     yield eat(m`<__Alternatives />`);
+    yield endSpan();
     yield eat(m`closeToken*: <* ')' />`);
   }
 
@@ -298,8 +301,9 @@ export const grammar = class RegexGrammar {
     yield eat(re`/[\da-fA-F]+/`);
   }
 
-  *EscapeSequence({ s }) {
-    const parentSpan = s().span;
+  *EscapeSequence({ ctx, s }) {
+    let { getGapNode } = ctx;
+    let parentSpan = s().span;
 
     yield startSpan('Escape');
 
@@ -309,7 +313,7 @@ export const grammar = class RegexGrammar {
     let cooked;
 
     if ((m_ = yield match(re`/[\\/nrt0]/`))) {
-      const match_ = printSource(m_);
+      let match_ = printSource(m_);
       yield eat(m`code*: <*Keyword ${buildString(match_)} />`);
 
       cooked = escapables.get(match_) || match_;
@@ -319,9 +323,9 @@ export const grammar = class RegexGrammar {
     } else if (yield match(re`/[ux]/`)) {
       let code = yield eat(m`code*: <EscapeCode />`);
 
-      let value = get('value', code.node);
+      let value = getGapNode(get('value', code.node));
 
-      cooked = String.fromCodePoint(parseInt(printSource(value), 16));
+      cooked = String.fromCodePoint(parseInt(printSource(value, { getGapNode }), 16));
     } else {
       yield fail();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-regex-vm-pattern",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "A BABLR language for nonbacktracking JS-style regexes",
   "engines": {
     "node": ">=12.0.0"
@@ -18,16 +18,15 @@
     "test": "mocha"
   },
   "dependencies": {
-    "@bablr/boot": "0.11.0",
-    "@bablr/helpers": "0.25.0",
-    "@bablr/agast-helpers": "0.10.0",
-    "@bablr/agast-vm-helpers": "0.10.0",
-    "iter-tools-es": "7.5.3"
+    "@bablr/boot": "0.11.1",
+    "@bablr/helpers": "0.25.1",
+    "@bablr/agast-helpers": "0.10.2",
+    "@bablr/agast-vm-helpers": "0.10.2"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
     "@qnighy/dedent": "0.1.1",
-    "bablr": "^0.11.0",
+    "bablr": "^0.11.2",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.47.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",