@bablr/bablr-vm 0.16.3 → 0.17.0

package/lib/spans.js

@@ -1,3 +1,6 @@
+import { getAt } from '@bablr/agast-helpers/btree';
+import { getOpenTag } from '@bablr/agast-helpers/tree';
+
 export function updateSpans(ctx, s, node, phase) {
   switch (phase) {
     case 'open': {
@@ -37,7 +40,7 @@ export function updateSpans(ctx, s, node, phase) {
 
         if (!s.balanced.size) throw new Error();
 
-        if (!balancedNode.children[0].value.attributes.balanced) {
+        if (!getOpenTag(balancedNode).value.attributes.balanced) {
           throw new Error();
         }
 

package/lib/state.js

@@ -4,6 +4,7 @@ import { getCooked } from '@bablr/agast-helpers/stream';
 import { match, guardWithPattern } from './utils/pattern.js';
 import { facades, actuals } from './facades.js';
 import { reifyExpression } from '@bablr/agast-vm-helpers';
+import { EmbeddedNode } from '@bablr/agast-helpers/symbols';
 
 export const StateFacade = class BABLRStateFacade {
   constructor(state) {
@@ -138,7 +139,7 @@ export const State = class BABLRState extends WeakStackFrame {
     let { span, spans, source, node } = this;
     let { guard } = span;
 
-    if (pattern.type === 'EmbeddedNode') {
+    if (pattern.type === EmbeddedNode) {
       pattern = reifyExpression(pattern.value);
     }
 
@@ -153,7 +154,7 @@ export const State = class BABLRState extends WeakStackFrame {
     }
 
     if (pattern?.intrinsicValue) {
-      // if (pattern.type === 'OpenNodeTag') {
+      // if (pattern.type === OpenNodeTag) {
 
       //   // TODO differntiate better between self-closing tags and matchers
       //   pattern = pattern.value;

package/lib/strategy.js

@@ -2,17 +2,27 @@ import size from 'iter-tools-es/methods/size';
 import { Coroutine } from '@bablr/coroutine';
 import {
   buildCall,
-  buildReference,
-  buildNull,
+  buildReferenceTag,
+  buildNullTag,
   buildEmbeddedTag,
+  buildArrayTag,
 } from '@bablr/agast-helpers/builders';
 import { StreamGenerator } from '@bablr/agast-helpers/stream';
-import { getOpenTag } from '@bablr/agast-helpers/tree';
 import { buildTokens } from './utils/token.js';
 import { formatType } from './utils/format.js';
 import { facades } from './facades.js';
 import { State } from './state.js';
 import { updateSpans } from './spans.js';
+import {
+  DoctypeTag,
+  OpenNodeTag,
+  CloseNodeTag,
+  ReferenceTag,
+  ShiftTag,
+  GapTag,
+  NullTag,
+  LiteralTag,
+} from '@bablr/agast-helpers/symbols';
 
 const { hasOwn } = Object;
 
@@ -55,20 +65,20 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
 
     switch (verb) {
       case 'advance': {
-        const { arguments: { 0: embeddedTerminal } = [] } = instr;
+        const { arguments: { 0: embeddedTag } = [] } = instr;
 
-        const terminal = embeddedTerminal.value;
+        const tag = embeddedTag.value;
 
-        switch (terminal?.type || 'Null') {
-          case 'DoctypeTag': {
+        switch (tag?.type || NullTag) {
+          case DoctypeTag: {
             const doctypeTag = yield instr;
 
             returnValue = doctypeTag;
             break;
           }
 
-          case 'OpenNodeTag': {
-            const { type } = terminal.value;
+          case OpenNodeTag: {
+            const { type } = tag.value;
 
             const openTag = yield instr;
 
@@ -80,7 +90,7 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
             break;
           }
 
-          case 'CloseNodeTag': {
+          case CloseNodeTag: {
             const { node } = s;
 
             const endTag = yield instr;
@@ -101,8 +111,8 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
             break;
           }
 
-          case 'Literal': {
-            const { value: pattern } = terminal;
+          case LiteralTag: {
+            const { value: pattern } = tag;
 
             let result = s.guardedMatch(pattern);
 
@@ -124,7 +134,7 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
             break;
           }
 
-          case 'Gap': {
+          case GapTag: {
             if (s.source.value == null && !s.source.done) {
               if (s.source.holding) {
                 s.source.unshift();
@@ -143,7 +153,7 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
             break;
           }
 
-          case 'Shift': {
+          case ShiftTag: {
             s.source.shift();
 
             returnValue = yield instr;
@@ -228,7 +238,7 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
             s.nodeForPath(s.path) && !s.nodeForPath(rejectedState.path.at(s.path.depth));
           const lowPath = rejectedState.path.at(
             Math.min(
-              s.path.depth + (didShift || s.result.type === 'Reference' ? 0 : 1),
+              s.path.depth + (didShift || s.result.type === ReferenceTag ? 0 : 1),
               rejectedState.path.depth,
             ),
           );
@@ -239,16 +249,15 @@ const __strategy = function* bablrStrategy(ctx, rootSource, agastState, strategy
           if (
             !didShift &&
             !hasOwn(lowNode.properties, name) &&
-            !(s.result.type === 'Reference' && s.result.value.name === name)
+            !(s.result.type === ReferenceTag && s.result.value.name === name)
           ) {
-            if (
-              !getOpenTag(lowNode)?.value.flags.trivia &&
-              !getOpenTag(lowNode)?.value.flags.escape
-            ) {
-              yield buildCall('advance', buildEmbeddedTag(buildReference(name, isArray)));
+            if (isArray) {
+              yield buildCall('advance', buildEmbeddedTag(buildReferenceTag(name, true)));
+              yield buildCall('advance', buildEmbeddedTag(buildArrayTag()));
+            } else {
+              yield buildCall('advance', buildEmbeddedTag(buildReferenceTag(name)));
+              yield buildCall('advance', buildEmbeddedTag(buildNullTag()));
             }
-
-            yield buildCall('advance', buildEmbeddedTag(buildNull()));
           }
         }
 

package/lib/utils/token.js

@@ -1,4 +1,4 @@
-import { buildLiteral, buildGap } from '@bablr/agast-helpers/builders';
+import { buildLiteralTag, buildGapTag } from '@bablr/agast-helpers/builders';
 
 export const isNewlineToken = (token) => /^\r|\r\n|\n$/.test(token.value);
 
@@ -15,16 +15,16 @@ export function* buildTokens(chrs) {
   for (const chr of chrs) {
     if (chr == null) {
       if (str) {
-        yield buildLiteral(str);
+        yield buildLiteralTag(str);
         str = '';
       }
-      yield buildGap();
+      yield buildGapTag();
     } else {
       str += chr;
     }
   }
 
   if (str) {
-    yield buildLiteral(str);
+    yield buildLiteralTag(str);
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/bablr-vm",
   "description": "A VM for parsing using BABLR languages",
-  "version": "0.16.3",
+  "version": "0.17.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -12,11 +12,11 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.3.2",
-    "@bablr/agast-vm-helpers": "0.3.2",
+    "@bablr/agast-helpers": "0.4.0",
+    "@bablr/agast-vm-helpers": "0.4.0",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.18.0",
-    "@bablr/regex-vm": "0.7.0",
+    "@bablr/helpers": "0.19.0",
+    "@bablr/regex-vm": "0.8.1",
     "@bablr/weak-stack": "0.1.0",
     "@iter-tools/imm-stack": "1.1.0",
     "iter-tools-es": "^7.5.3"

package/lib/symbols.js

@@ -1 +0,0 @@
-export const node = Symbol.for('@bablr/node');