@bablr/bablr-vm 0.13.3 → 0.15.0

package/README.md

@@ -1,4 +1,4 @@
-# @bablr/vm
+# @bablr/bablr-vm
 
 [![come chat on Discord](https://img.shields.io/discord/1151914613089251388)](https://discord.gg/NfMNyYN6cX)
 

package/lib/source.js

@@ -1,5 +1,5 @@
 import { WeakStackFrame } from '@bablr/weak-stack';
-import { maybeWait, getStreamIterator } from '@bablr/agast-helpers/stream';
+import { maybeWait, getStreamIterator, emptyStreamIterator } from '@bablr/agast-helpers/stream';
 import { facades, actuals } from './facades.js';
 
 // Queue item instances are shared between all forks.
@@ -168,6 +168,10 @@ export const SourceFacade = class BABLRSourceFacade {
     return actuals.get(this).done;
   }
 
+  get value() {
+    return actuals.get(this).value;
+  }
+
   get index() {
     return actuals.get(this).index;
   }
@@ -197,7 +201,7 @@ export const Source = class BABLRSource extends WeakStackFrame {
   }
 
   get value() {
-    return this.fork.value;
+    return this.holding ? null : this.fork.value;
   }
 
   get done() {
@@ -247,7 +251,7 @@ export const Source = class BABLRSource extends WeakStackFrame {
   }
 
   [Symbol.for('@@streamIterator')]() {
-    return this.fork.clone()[Symbol.for('@@streamIterator')]();
+    return this.holding ? emptyStreamIterator : this.fork.clone()[Symbol.for('@@streamIterator')]();
   }
 
   formatIndex() {

package/lib/spans.js

@@ -10,7 +10,7 @@ export function updateSpans(ctx, s, node, phase) {
 
       if (flags.intrinsic) {
         if (s.path && balanced) {
-          s.spans = s.spans.push({
+            s.spans = s.spans.push({
             type: 'Lexical',
             name: balancedSpan || s.span.name,
             path: s.path,

package/lib/state.js

@@ -33,6 +33,10 @@ export const StateFacade = class BABLRStateFacade {
     return actuals.get(this).node;
   }
 
+  get parentNode() {
+    return actuals.get(this).parentNode;
+  }
+
   get source() {
     return facades.get(actuals.get(this).source);
   }
@@ -40,6 +44,10 @@ export const StateFacade = class BABLRStateFacade {
   get depth() {
     return actuals.get(this).depth;
   }
+
+  get status() {
+    return actuals.get(this).status;
+  }
 };
 
 export const State = class BABLRState extends WeakStackFrame {
@@ -53,6 +61,8 @@ export const State = class BABLRState extends WeakStackFrame {
     this.balanced = balanced;
     this.spans = spans;
 
+    this.status = 'active';
+
     new StateFacade(this);
   }
 
@@ -79,6 +89,10 @@ export const State = class BABLRState extends WeakStackFrame {
     return this.agast.node;
   }
 
+  get parentNode() {
+    return this.agast.parentNode;
+  }
+
   get holding() {
     return this.agast.holding;
   }
@@ -100,10 +114,11 @@ export const State = class BABLRState extends WeakStackFrame {
     let { guard } = span;
 
     if (pattern?.intrinsicValue) {
-      if (pattern.type === 'OpenNodeTag') {
-        // TODO differntiate better between self-closing tags and matchers
-        pattern = pattern.value;
-      }
+      // if (pattern.type === 'OpenNodeTag') {
+
+      //   // TODO differntiate better between self-closing tags and matchers
+      //   pattern = pattern.value;
+      // }
 
       ({ guard } = span);
 

package/lib/strategy.js

@@ -60,38 +60,33 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
           }
 
           case 'OpenNodeTag': {
-            const { intrinsicValue } = terminal.value;
+            const { type, intrinsicValue } = terminal.value;
 
             const openTag = yield sourceInstr;
 
-            let intrinsicResult = intrinsicValue && s.guardedMatch(terminal.value);
+            if (type) {
+              let intrinsicResult = intrinsicValue && s.guardedMatch(terminal.value);
 
-            if (intrinsicResult instanceof Promise) {
-              intrinsicResult = yield intrinsicResult;
-            }
-
-            updateSpans(ctx, s, intrinsicValue ? ctx.nodeForTag(openTag) : s.node, 'open');
-
-            if (intrinsicValue) {
-              if (!intrinsicResult) {
-                throw new Error('advance failed to match an intrinsic node');
+              if (intrinsicResult instanceof Promise) {
+                intrinsicResult = yield intrinsicResult;
               }
 
-              const sourceStep = s.source.advance(intrinsicResult.length);
+              updateSpans(ctx, s, ctx.nodeForTag(openTag), 'open');
 
-              if (sourceStep instanceof Promise) {
-                yield sourceStep;
-              }
+              if (intrinsicValue) {
+                if (!intrinsicResult) {
+                  throw new Error('advance failed to match an intrinsic node');
+                }
 
-              updateSpans(ctx, s, ctx.nodeForTag(openTag), 'close');
-            }
+                const sourceStep = s.source.advance(intrinsicResult.length);
 
-            returnValue = openTag;
-            break;
-          }
+                if (sourceStep instanceof Promise) {
+                  yield sourceStep;
+                }
 
-          case 'OpenFragmentTag': {
-            const openTag = yield sourceInstr;
+                updateSpans(ctx, s, ctx.nodeForTag(openTag), 'close');
+              }
+            }
 
             returnValue = openTag;
             break;
@@ -104,16 +99,7 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
 
             if (s.path) {
               updateSpans(ctx, s, node, 'close');
-            }
-
-            returnValue = endTag;
-            break;
-          }
-
-          case 'CloseFragmentTag': {
-            returnValue = yield sourceInstr;
-
-            if (!s.path) {
+            } else {
               if (!s.source.done) {
                 throw new Error('Parser failed to consume input');
               }
@@ -122,6 +108,8 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
                 throw new Error('Parser did not match all balanced nodes');
               }
             }
+
+            returnValue = endTag;
             break;
           }
 
@@ -150,10 +138,14 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
 
           case 'Gap': {
             if (s.source.value == null && !s.source.done) {
-              const sourceStep = s.source.advance(1);
-
-              if (sourceStep instanceof Promise) {
-                yield sourceStep;
+              if (s.source.holding) {
+                s.source.unshift();
+              } else {
+                const sourceStep = s.source.advance(1);
+
+                if (sourceStep instanceof Promise) {
+                  yield sourceStep;
+                }
               }
 
               returnValue = yield sourceInstr;
@@ -163,6 +155,13 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
             break;
           }
 
+          case 'Shift': {
+            s.source.shift();
+
+            returnValue = yield sourceInstr;
+            break;
+          }
+
           default: {
             returnValue = yield sourceInstr;
             break;
@@ -185,22 +184,6 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
         break;
       }
 
-      case 'shift': {
-        s.source.shift();
-
-        yield sourceInstr;
-
-        break;
-      }
-
-      case 'unshift': {
-        s.source.unshift();
-
-        yield sourceInstr;
-
-        break;
-      }
-
       case 'branch': {
         const baseState = s;
         let { source, agast, balanced, spans, node } = baseState;
@@ -209,7 +192,9 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
 
         s = s.push(source.branch(), agast, balanced, spans);
 
-        resolvedLanguages.set(s.node, resolvedLanguages.get(node));
+        if (node) {
+          resolvedLanguages.set(s.node, resolvedLanguages.get(node));
+        }
 
         returnValue = facades.get(s);
         break;
@@ -218,6 +203,8 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
       case 'accept': {
         const accepted = s;
 
+        s.status = 'accepted';
+
         const agastState = yield sourceInstr;
 
         s = s.parent;
@@ -239,27 +226,29 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
       case 'reject': {
         const rejectedState = s;
 
+        s.status = 'rejected';
+
         yield sourceInstr;
 
         s = s.parent;
 
-        if (rejectedState.path.depth > s.path.depth) {
+        if (s.path.depth && rejectedState.path.depth > s.path.depth) {
+          // const didShift = rejectedState.node.at(sNodeDepth) === s.node;
+          const didShift =
+            ctx.nodeForPath(s.path) && !ctx.nodeForPath(rejectedState.path.at(s.path.depth));
           const lowPath = rejectedState.path.at(
-            Math.min(s.path.depth + 1, rejectedState.path.depth),
+            Math.min(s.path.depth + (didShift ? 0 : 1), rejectedState.path.depth),
           );
+          const lowNode = s.node || s.parentNode;
 
-          if (s.path.depth) {
-            const { name, isArray } = lowPath.reference?.value || {};
-
-            if (s.node.depth === s.path.depth && !s.node.resolver.counters.has(name)) {
-              if (!lowPath.openTag?.value.flags.trivia && !lowPath.openTag?.value.flags.escape) {
-                yield buildCall('advance', buildReference(name, isArray));
-              }
+          const { name, isArray } = lowPath.reference?.value || {};
 
-              if (s.result.type === 'Reference') {
-                yield buildCall('advance', buildNull());
-              }
+          if (!didShift && !lowNode.resolver.counters.has(name)) {
+            if (!lowNode.openTag?.value.flags.trivia && !lowNode.openTag?.value.flags.escape) {
+              yield buildCall('advance', buildReference(name, isArray));
             }
+
+            yield buildCall('advance', buildNull());
           }
         }
 
@@ -271,6 +260,7 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
         break;
       }
 
+      case 'write':
       case 'bindAttribute': {
         returnValue = yield sourceInstr;
         break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/bablr-vm",
   "description": "A VM for parsing using BABLR languages",
-  "version": "0.13.3",
+  "version": "0.15.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -12,10 +12,10 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.1.5",
-    "@bablr/agast-vm-helpers": "0.1.3",
+    "@bablr/agast-helpers": "0.2.0",
+    "@bablr/agast-vm-helpers": "0.2.0",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.15.4",
+    "@bablr/helpers": "0.17.0",
     "@bablr/regex-vm": "0.5.1",
     "@bablr/weak-stack": "0.1.0",
     "@iter-tools/imm-stack": "1.1.0",