ohm-js 16.3.0 → 16.3.1

package/extras/semantics-toAST.js

@@ -1,13 +1,5 @@
 'use strict';
 
-// --------------------------------------------------------------------
-// Imports
-// --------------------------------------------------------------------
-
-const pexprs = require('../src/pexprs');
-const MatchResult = require('../src/MatchResult');
-const Grammar = require('../src/Grammar');
-
 // --------------------------------------------------------------------
 // Operations
 // --------------------------------------------------------------------
@@ -23,11 +15,6 @@ const defaultOperation = {
 
     // without customization
     if (!Object.prototype.hasOwnProperty.call(mapping, ctorName)) {
-      // intermediate node
-      if (this._node instanceof pexprs.Alt || this._node instanceof pexprs.Apply) {
-        return children[0].toAST(mapping);
-      }
-
       // lexical rule
       if (this.isLexical()) {
         return this.sourceString;
@@ -111,8 +98,8 @@ const defaultOperation = {
 // The optional `mapping` parameter can be used to customize how the nodes of the CST
 // are mapped to the AST (see /doc/extras.md#toastmatchresult-mapping).
 function toAST(res, mapping) {
-  if (!(res instanceof MatchResult) || res.failed()) {
-    throw new Error('toAST() expects a succesfull MatchResult as first parameter');
+  if (typeof res.failed !== 'function' || res.failed()) {
+    throw new Error('toAST() expects a succesful MatchResult as first parameter');
   }
 
   mapping = Object.assign({}, mapping);
@@ -130,7 +117,7 @@ function toAST(res, mapping) {
 
 // Returns a semantics containg the toAST(mapping) operation for the given grammar g.
 function semanticsForToAST(g) {
-  if (!(g instanceof Grammar)) {
+  if (typeof g.createSemantics !== 'function') {
     throw new Error('semanticsToAST() expects a Grammar as parameter');
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohm-js",
-  "version": "16.3.0",
+  "version": "16.3.1",
   "description": "An object-oriented language for parsing and pattern matching",
   "repository": "https://github.com/harc/ohm",
   "keywords": [
@@ -15,7 +15,7 @@
     "rapid",
     "prototyping"
   ],
-  "homepage": "https://ohmlang.github.io/",
+  "homepage": "https://ohmjs.org",
   "bugs": "https://github.com/harc/ohm/issues",
   "main": "index.js",
   "module": "dist/ohm.esm.js",

package/src/errors.js

@@ -218,7 +218,10 @@ function invalidCodePoint(applyWrapper) {
   // Get an interval that covers all of the hex digits.
   const digitIntervals = applyWrapper.children.slice(1, -1).map(d => d.source);
   const fullInterval = digitIntervals[0].coverageWith(...digitIntervals.slice(1));
-  return createError(`U+${fullInterval.contents} is not a valid Unicode code point`, fullInterval);
+  return createError(
+      `U+${fullInterval.contents} is not a valid Unicode code point`,
+      fullInterval
+  );
 }
 
 // ----------------- Kleene operators -----------------