@bablr/bablr-vm 0.23.2 → 0.23.3

package/lib/context.js

@@ -1,6 +1,8 @@
 import { buildDependentLanguages } from '@bablr/helpers/grammar';
 import { getGapNode } from './facades.js';
 
+let facades = new WeakMap();
+
 export const Context = class BABLRContext {
   static from(language, productionEnhancer) {
     return new Context(buildDependentLanguages(language), productionEnhancer);
@@ -25,12 +27,19 @@ export const Context = class BABLRContext {
   }
 
   getPublic() {
+    let value = facades.get(this);
+    if (value) return value;
+
     let { productionEnhancer, getGrammar } = this;
 
-    return Object.freeze({
+    value = Object.freeze({
       getGrammar,
       getGapNode,
       productionEnhancer,
     });
+
+    facades.set(this, value);
+
+    return value;
   }
 };

package/lib/evaluate.js

@@ -1,6 +1,11 @@
 /* global WeakSet */
 import { Coroutine } from '@bablr/coroutine';
-import { buildAttributeDefinition, buildCloseNodeTag } from '@bablr/agast-helpers/builders';
+import {
+  buildAttributeDefinition,
+  buildCloseNodeTag,
+  buildTypedSpan,
+  deepFreeze,
+} from '@bablr/agast-helpers/builders';
 import { getStreamIterator, printType, StreamIterable, wait } from '@bablr/agast-helpers/stream';
 import { State } from './state.js';
 import {
@@ -21,8 +26,7 @@ import { buildWriteEffect } from '@bablr/agast-vm-helpers/builders';
 import { has } from '@bablr/agast-helpers/object';
 import { reifyBablrOptions } from '@bablr/agast-vm-helpers';
 import { buildNode, getTags } from '@bablr/agast-helpers/path';
-import * as BTree from '@bablr/agast-helpers/btree';
-import { resolveLanguage } from '@bablr/helpers/grammar';
+import * as Spans from '@bablr/agast-helpers/spans';
 
 const getSourceLength = (tags) => {
   let i = 0;
@@ -55,7 +59,7 @@ function* __bablr(ctx, rootSource, rootLanguage, strategy, options, registerNode
 
   let getState = () => s.getPublic();
 
-  s = State.from(rootSource, ctx, rootLanguage, options.expressions);
+  s = State.from(rootSource, ctx, rootLanguage, options.expressions, options.spans);
 
   s.source.advance();
 
@@ -337,14 +341,15 @@ function* __bablr(ctx, rootSource, rootLanguage, strategy, options, registerNode
       }
 
       case 'startSpan': {
-        let { arguments: { 0: name, 1: guard = null } = [] } = instr;
-        s.spans = s.spans.push({ type: 'Instruction', name, guard });
+        let { arguments: { 0: name, 1: guard = null, 2: { value: props } } = [] } = instr;
+        deepFreeze(props);
+        s.spans = Spans.push(s.spans, buildTypedSpan('Instruction', name, guard, props));
         break;
       }
 
       case 'endSpan': {
-        if (s.spans.value.type !== 'Instruction') throw new Error();
-        s.spans = s.spans.pop();
+        if (s.span.type !== 'Instruction') throw new Error();
+        s.spans = Spans.pop(s.spans);
         break;
       }
 

package/lib/spans.js

@@ -1,26 +1,13 @@
 import { ReferenceTag } from '@bablr/agast-helpers/symbols';
-import * as BTree from '@bablr/agast-helpers/btree';
+import * as Spans from '@bablr/agast-helpers/spans';
+import { buildTypedSpan } from '@bablr/agast-helpers/builders';
 
 const popSpan = (s) => {
-  s.spans = s.spans.pop();
+  s.spans = Spans.pop(s.spans);
 };
 
 const pushSpan = (s, type, name, guard) => {
-  let isSubspan = name[0] === '.';
-  let topFrame = s.spans.value;
-
-  // if (isSubspan) {
-  //   let buildGuard = () => {
-  //     return buildPattern();
-  //   };
-  //   let name_ = topFrame.name + name;
-  //   let subframes = BTree.push(topFrame.subframes, topFrame);
-  //   let guard_ = guard;
-
-  //   s.spans = s.spans.push({ type, name: name_, guard: guard_, subframes });
-  // } else {
-  s.spans = s.spans.push({ type, name, guard, subframes: BTree.fromValues([]) });
-  // }
+  s.spans = Spans.push(s.spans, buildTypedSpan(type, name, guard));
 };
 
 export function updateSpans(m, phase) {

package/lib/state.js

@@ -1,6 +1,7 @@
 import emptyStack from '@iter-tools/imm-stack';
 import { maybeWait } from '@bablr/agast-helpers/stream';
 import * as BTree from '@bablr/agast-helpers/btree';
+import * as Spans from '@bablr/agast-helpers/spans';
 import { reifyExpression } from '@bablr/agast-vm-helpers';
 import { Matcher, Node, Regex } from '@bablr/agast-vm-helpers/symbols';
 import { match, guardWithPattern } from './utils/pattern.js';
@@ -9,13 +10,14 @@ import { getOpenTag } from '@bablr/agast-helpers/path';
 export const nodeStates = new WeakMap();
 
 export const State = class BABLRState {
-  static from(source, context, language, expressions = []) {
+  static from(source, context, language, expressions = [], spans = Spans.fromValues([])) {
     return new State(
       null,
       source,
       context,
       BTree.fromValues([language]),
       emptyStack.push(...emptyStack.push(...expressions).valuesReverse()),
+      spans,
     );
   }
 
@@ -25,8 +27,8 @@ export const State = class BABLRState {
     context,
     languages,
     expressions = emptyStack,
+    spans = Spans.fromValues([]),
     balanced = emptyStack,
-    spans = emptyStack,
     resultPath = null,
     depths = { path: -1, result: -1, emitted: -1, shift: 0, nodeShift: 0 },
     held = null,
@@ -62,7 +64,7 @@ export const State = class BABLRState {
   }
 
   get span() {
-    return this.spans.value;
+    return Spans.getAt(-1, this.spans);
   }
 
   get result() {
@@ -77,15 +79,15 @@ export const State = class BABLRState {
     return !!this.parent;
   }
 
-  push(source, context, languages, expressions, balanced, spans, resultPath, depths, held, node) {
+  push(source, context, languages, expressions, spans, balanced, resultPath, depths, held, node) {
     return new State(
       this,
       source,
       context,
       languages,
       expressions,
-      balanced,
       spans,
+      balanced,
       resultPath,
       depths,
       held,
@@ -98,7 +100,8 @@ export const State = class BABLRState {
 
     return Object.freeze({
       languages,
-      span: spans.value?.name,
+      span: Spans.getAt(-1, spans),
+      spans: spans,
       depths: Object.freeze({ ...depths }),
       holding: !!held,
       held,
@@ -161,8 +164,8 @@ export const State = class BABLRState {
     let {
       source,
       context,
-      balanced,
       spans,
+      balanced,
       resultPath,
       depths,
       held,
@@ -176,8 +179,8 @@ export const State = class BABLRState {
       context,
       languages,
       expressions,
-      balanced,
       spans,
+      balanced,
       resultPath,
       { ...depths },
       held,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/bablr-vm",
   "description": "A VM for parsing using BABLR languages",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -12,12 +12,12 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.10.2",
-    "@bablr/agast-vm": "0.11.1",
-    "@bablr/agast-vm-helpers": "0.10.2",
+    "@bablr/agast-helpers": "0.10.4",
+    "@bablr/agast-vm": "0.11.2",
+    "@bablr/agast-vm-helpers": "0.10.4",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.25.1",
-    "@bablr/regex-vm": "0.14.1",
+    "@bablr/helpers": "0.25.2",
+    "@bablr/regex-vm": "0.14.2",
     "@bablr/stream-iterator": "2.0.0",
     "@iter-tools/imm-stack": "1.2.0",
     "iter-tools-es": "7.5.3"