@bablr/bablr-vm 0.23.7 → 0.23.9

package/lib/evaluate.js

@@ -59,7 +59,7 @@ function* __bablr(ctx, rootSource, rootLanguage, strategy, options, registerNode
 
   let getState = () => s.getPublic();
 
-  s = State.from(rootSource, ctx, rootLanguage, options.expressions, options.spans);
+  s = State.from(rootSource, ctx, rootLanguage, options.spans);
 
   s.source.advance();
 
@@ -292,16 +292,6 @@ function* __bablr(ctx, rootSource, rootLanguage, strategy, options, registerNode
               break;
             }
 
-            if (s.expressions.size) {
-              let expression = s.expressions.value;
-              let node = getRoot(expression);
-
-              m.advance(node);
-
-              s.expressions = s.expressions.pop();
-              break;
-            }
-
             if (Tags.getSize(getTags(s.node))) {
               m.advance(tag, s);
             } else {

package/lib/state.js

@@ -10,15 +10,8 @@ import { getOpenTag } from '@bablr/agast-helpers/path';
 export const nodeStates = new WeakMap();
 
 export const State = class BABLRState {
-  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,
-    );
+  static from(source, context, language, spans = Spans.fromValues([])) {
+    return new State(null, source, context, BTree.fromValues([language]), spans);
   }
 
   constructor(
@@ -26,7 +19,6 @@ export const State = class BABLRState {
     source,
     context,
     languages,
-    expressions = emptyStack,
     spans = Spans.fromValues([]),
     balanced = emptyStack,
     resultPath = null,
@@ -40,7 +32,6 @@ export const State = class BABLRState {
     this.source = source;
     this.context = context;
     this.languages = languages;
-    this.expressions = expressions;
     this.balanced = balanced;
     this.spans = spans;
     this.resultPath = resultPath;
@@ -79,13 +70,12 @@ export const State = class BABLRState {
     return !!this.parent;
   }
 
-  push(source, context, languages, expressions, spans, balanced, resultPath, depths, held, node) {
+  push(source, context, languages, spans, balanced, resultPath, depths, held, node) {
     return new State(
       this,
       source,
       context,
       languages,
-      expressions,
       spans,
       balanced,
       resultPath,
@@ -161,24 +151,12 @@ export const State = class BABLRState {
 
   branch() {
     let baseState = this;
-    let {
-      source,
-      context,
-      spans,
-      balanced,
-      resultPath,
-      depths,
-      held,
-      node,
-      languages,
-      expressions,
-    } = baseState;
+    let { source, context, spans, balanced, resultPath, depths, held, node, languages } = baseState;
 
     let child = this.push(
       source.branch(),
       context,
       languages,
-      expressions,
       spans,
       balanced,
       resultPath,
@@ -206,7 +184,6 @@ export const State = class BABLRState {
     parent.held = accepted.held;
     parent.depths = accepted.depths;
     parent.languages = accepted.languages;
-    parent.expressions = accepted.expressions;
 
     if (parent.depths.result + 1 === accepted.depths.result) {
       parent.resultPath = parent.resultPath.siblingAt(accepted.resultPath.tagsIndex);

package/lib/utils/pattern.js

@@ -131,11 +131,13 @@ function* __stringEqual(str, iterable) {
     let strStep = strIter.next();
     step = iter.next();
 
-    while (!strStep.done) {
+    while (true) {
       if (step instanceof Promise) {
         step = yield wait(step);
       }
 
+      if (strStep.done) break;
+
       if (step.value !== strStep.value) {
         step = iter.return();
         if (step instanceof Promise) {
@@ -166,9 +168,11 @@ export const match = (pattern, source) => {
       ? [buildOpenNodeTag(tokenFlags), buildLiteralTag(pattern), buildCloseNodeTag()]
       : null;
   } else if (typeof pattern === 'string') {
-    return stringEqual(pattern, source)
-      ? [buildOpenNodeTag(tokenFlags), buildLiteralTag(pattern), buildCloseNodeTag()]
-      : null;
+    return maybeWait(stringEqual(pattern, source), (equal) => {
+      return equal
+        ? [buildOpenNodeTag(tokenFlags), buildLiteralTag(pattern), buildCloseNodeTag()]
+        : null;
+    });
   }
 
   const pattern_ =

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/bablr-vm",
   "description": "A VM for parsing using BABLR languages",
-  "version": "0.23.7",
+  "version": "0.23.9",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [