ohm-js 16.3.1 → 16.3.2

package/dist/ohm.esm.js

@@ -293,20 +293,19 @@ exports.unexpectedObjToString = function(obj) {
 
 const common$k = common$l;
 
-// Ensures that the deprecation warning for `primitiveValue` only appears once.
-let didWarnForPrimitiveValue = false;
-
 // --------------------------------------------------------------------
 // Private stuff
 // --------------------------------------------------------------------
 
 class Node {
-  constructor(grammar, ctorName, matchLength) {
-    this.grammar = grammar;
-    this.ctorName = ctorName;
+  constructor(matchLength) {
     this.matchLength = matchLength;
   }
 
+  get ctorName() {
+    throw new Error('subclass responsibility');
+  }
+
   numChildren() {
     return this.children ? this.children.length : 0;
   }
@@ -400,52 +399,38 @@ class Node {
   isOptional() {
     return false;
   }
-
-  toJSON() {
-    return {[this.ctorName]: this.children};
-  }
 }
 
 // Terminals
 
 class TerminalNode$2 extends Node {
-  constructor(grammar, value) {
-    const matchLength = value ? value.length : 0;
-    super(grammar, '_terminal', matchLength);
-    this._value = value;
+  get ctorName() {
+    return '_terminal';
   }
 
   isTerminal() {
     return true;
   }
 
-  toJSON() {
-    return {[this.ctorName]: this._value};
-  }
-
   get primitiveValue() {
-    if (!didWarnForPrimitiveValue) {
-      // eslint-disable-next-line no-console
-      console.warn(
-          'Warning: primitiveValue is deprecated and will be removed in a future version of Ohm. ' +
-          'Use sourceString instead.'
-      );
-      didWarnForPrimitiveValue = true;
-    }
-
-    return this._value;
+    throw new Error('The `primitiveValue` property was removed in Ohm v17.');
   }
 }
 
 // Nonterminals
 
 class NonterminalNode$1 extends Node {
-  constructor(grammar, ruleName, children, childOffsets, matchLength) {
-    super(grammar, ruleName, matchLength);
+  constructor(ruleName, children, childOffsets, matchLength) {
+    super(matchLength);
+    this.ruleName = ruleName;
     this.children = children;
     this.childOffsets = childOffsets;
   }
 
+  get ctorName() {
+    return this.ruleName;
+  }
+
   isNonterminal() {
     return true;
   }
@@ -462,13 +447,17 @@ class NonterminalNode$1 extends Node {
 // Iterations
 
 class IterationNode$2 extends Node {
-  constructor(grammar, children, childOffsets, matchLength, isOptional) {
-    super(grammar, '_iter', matchLength);
+  constructor(children, childOffsets, matchLength, isOptional) {
+    super(matchLength);
     this.children = children;
     this.childOffsets = childOffsets;
     this.optional = isOptional;
   }
 
+  get ctorName() {
+    return '_iter';
+  }
+
   isIteration() {
     return true;
   }
@@ -2023,7 +2012,7 @@ pexprs$g.any.eval = function(state) {
   const origPos = inputStream.pos;
   const ch = inputStream.next();
   if (ch) {
-    state.pushBinding(new TerminalNode$1(state.grammar, ch), origPos);
+    state.pushBinding(new TerminalNode$1(ch.length), origPos);
     return true;
   } else {
     state.processFailure(origPos, this);
@@ -2035,7 +2024,7 @@ pexprs$g.end.eval = function(state) {
   const {inputStream} = state;
   const origPos = inputStream.pos;
   if (inputStream.atEnd()) {
-    state.pushBinding(new TerminalNode$1(state.grammar, undefined), origPos);
+    state.pushBinding(new TerminalNode$1(0), origPos);
     return true;
   } else {
     state.processFailure(origPos, this);
@@ -2050,7 +2039,7 @@ pexprs$g.Terminal.prototype.eval = function(state) {
     state.processFailure(origPos, this);
     return false;
   } else {
-    state.pushBinding(new TerminalNode$1(state.grammar, this.obj), origPos);
+    state.pushBinding(new TerminalNode$1(this.obj.length), origPos);
     return true;
   }
 };
@@ -2066,7 +2055,7 @@ pexprs$g.Range.prototype.eval = function(state) {
   // Always compare by code point value to get the correct result in all scenarios.
   // Note that for strings of length 1, codePointAt(0) and charPointAt(0) are equivalent.
   if (cp !== undefined && this.from.codePointAt(0) <= cp && cp <= this.to.codePointAt(0)) {
-    state.pushBinding(new TerminalNode$1(state.grammar, String.fromCodePoint(cp)), origPos);
+    state.pushBinding(new TerminalNode$1(String.fromCodePoint(cp).length), origPos);
     return true;
   } else {
     state.processFailure(origPos, this);
@@ -2151,7 +2140,7 @@ pexprs$g.Iter.prototype.eval = function(state) {
   const isOptional = this instanceof pexprs$g.Opt;
   for (idx = 0; idx < cols.length; idx++) {
     state._bindings.push(
-        new IterationNode$1(state.grammar, cols[idx], colOffsets[idx], matchLength, isOptional)
+        new IterationNode$1(cols[idx], colOffsets[idx], matchLength, isOptional)
     );
     state._bindingOffsets.push(offset);
   }
@@ -2326,13 +2315,8 @@ pexprs$g.Apply.prototype.evalOnce = function(expr, state) {
     const arity = expr.getArity();
     const bindings = state._bindings.splice(state._bindings.length - arity, arity);
     const offsets = state._bindingOffsets.splice(state._bindingOffsets.length - arity, arity);
-    return new NonterminalNode(
-        state.grammar,
-        this.ruleName,
-        bindings,
-        offsets,
-        inputStream.pos - origPos
-    );
+    const matchLength = inputStream.pos - origPos;
+    return new NonterminalNode(this.ruleName, bindings, offsets, matchLength);
   } else {
     return false;
   }
@@ -2387,7 +2371,7 @@ pexprs$g.UnicodeChar.prototype.eval = function(state) {
   const origPos = inputStream.pos;
   const ch = inputStream.next();
   if (ch && this.pattern.test(ch)) {
-    state.pushBinding(new TerminalNode$1(state.grammar, ch), origPos);
+    state.pushBinding(new TerminalNode$1(ch.length), origPos);
     return true;
   } else {
     state.processFailure(origPos, this);
@@ -3169,7 +3153,7 @@ class CaseInsensitiveTerminal$1 extends PExpr {
       state.processFailure(origPos, this);
       return false;
     } else {
-      state.pushBinding(new TerminalNode(state.grammar, matchStr), origPos);
+      state.pushBinding(new TerminalNode(matchStr.length), origPos);
       return true;
     }
   }
@@ -3730,7 +3714,7 @@ MatchState$1.prototype = {
   // Returns the memoized trace entry for `expr` at `pos`, if one exists, `null` otherwise.
   getMemoizedTraceEntry(pos, expr) {
     const posInfo = this.memoTable[pos];
-    if (posInfo && expr.ruleName) {
+    if (posInfo && expr instanceof pexprs$5.Apply) {
       const memoRec = posInfo.memo[expr.toMemoKey()];
       if (memoRec && memoRec.traceEntry) {
         const entry = memoRec.traceEntry.cloneWithExpr(expr);
@@ -3872,11 +3856,15 @@ MatchState$1.prototype = {
           key => this.recordedFailures[key]
       );
     }
+    const cst = this._bindings[0];
+    if (cst) {
+      cst.grammar = this.grammar;
+    }
     return new MatchResult$1(
         this.matcher,
         this.input,
         this.startExpr,
-        this._bindings[0],
+        cst,
         this._bindingOffsets[0],
         this.rightmostFailurePosition,
         rightmostFailures
@@ -4059,11 +4047,6 @@ class Wrapper {
     return '[semantics wrapper for ' + this._node.grammar.name + ']';
   }
 
-  // This is used by ohm editor to display a node wrapper appropriately.
-  toJSON() {
-    return this.toString();
-  }
-
   _forgetMemoizedResultFor(attributeName) {
     // Remove the memoized attribute from the cstNode and all its children.
     delete this._node[this._semantics.attributeKeys[attributeName]];
@@ -4143,7 +4126,7 @@ class Wrapper {
     const childWrappers = optChildWrappers || [];
 
     const childNodes = childWrappers.map(c => c._node);
-    const iter = new IterationNode(this._node.grammar, childNodes, [], -1, false);
+    const iter = new IterationNode(childNodes, [], -1, false);
 
     const wrapper = this._semantics.wrap(iter, null, null);
     wrapper._childWrappers = childWrappers;
@@ -4170,18 +4153,6 @@ class Wrapper {
     return this._node.numChildren();
   }
 
-  // Returns the primitive value of this CST node, if it's a terminal node. Otherwise,
-  // throws an exception.
-  // DEPRECATED: Use `sourceString` instead.
-  get primitiveValue() {
-    if (this.isTerminal()) {
-      return this._node.primitiveValue;
-    }
-    throw new TypeError(
-        "tried to access the 'primitiveValue' attribute of a non-terminal CST node"
-    );
-  }
-
   // Returns the contents of the input stream consumed by this CST node.
   get sourceString() {
     return this.source.contents;
@@ -5489,7 +5460,7 @@ Builder$2.prototype = {
 var Builder_1 = Builder$2;
 
 var name = "ohm-js";
-var version$2 = "16.3.1";
+var version$2 = "16.3.2";
 var description = "An object-oriented language for parsing and pattern matching";
 var repository = "https://github.com/harc/ohm";
 var keywords = [