ohm-js 16.3.2 → 16.4.0

package/dist/third_party/UnicodeCategories.d.ts

@@ -0,0 +1,13 @@
+export const Lu: RegExp;
+export const Ll: RegExp;
+export const Lt: RegExp;
+export const Lm: RegExp;
+export const Lo: RegExp;
+export const Nl: RegExp;
+export const Nd: RegExp;
+export const Mn: RegExp;
+export const Mc: RegExp;
+export const Pc: RegExp;
+export const Zs: RegExp;
+export const L: RegExp;
+export const Ltmo: RegExp;

package/index.d.ts

@@ -5,6 +5,33 @@ export = ohm;
 declare namespace ohm {
   const ohmGrammar: Grammar;
 
+  /**
+   * Constructors for parsing expressions (aka pexprs). (Except for `any`
+   * and `end`, which are not constructors but singleton instances.)
+   */
+  const pexprs: {
+    PExpr: typeof PExpr;
+    Terminal: typeof Terminal;
+    Range: typeof Range;
+    Param: typeof Param;
+    Alt: typeof Alt;
+    Extend: typeof Extend;
+    Splice: typeof Splice;
+    Seq: typeof Seq;
+    Iter: typeof Iter;
+    Star: typeof Star;
+    Plus: typeof Plus;
+    Opt: typeof Opt;
+    Not: typeof Not;
+    Lookahead: typeof Lookahead;
+    Lex: typeof Lex;
+    Apply: typeof Apply;
+    UnicodeChar: typeof UnicodeChar;
+    CaseInsensitiveTerminal: typeof CaseInsensitiveTerminal;
+    any: PExpr;
+    end: PExpr;
+  };
+
   /**
    * Instantiate the Grammar defined by source. If specified, namespace is
    * the Namespace to use when resolving external references in the grammar.
@@ -13,7 +40,7 @@ declare namespace ohm {
 
   /**
    * grammarFromScriptElement was removed in Ohm v16.0. See
-   * https://git.io/Jwow5 for more info.
+   * https://ohmjs.org/d/gfs for more info.
    * @deprecated
    */
   function grammarFromScriptElement(node?: unknown, namespace?: Namespace): Grammar;
@@ -28,7 +55,7 @@ declare namespace ohm {
 
   /**
    * grammarsFromScriptElements was removed in Ohm v16.0. See
-   * https://git.io/Jwow5 for more info.
+   * https://ohmjs.org/d/gfs for more info.
    * @deprecated
    */
   function grammarsFromScriptElements(nodeList?: unknown, namespace?: Namespace): Namespace;
@@ -98,7 +125,33 @@ declare namespace ohm {
     extendSemantics(superSemantics: Semantics): Semantics;
   }
 
-  interface PExpr {}
+  class PExpr {
+    getArity(): number;
+    isNullable(): boolean;
+    toString(): string;
+    toDisplayString(): string;
+  }
+  class Terminal extends PExpr {}
+  class Range extends PExpr {}
+  class Param extends PExpr {}
+  class Alt extends PExpr {
+    terms: PExpr[];
+  }
+  class Extend extends Alt {}
+  class Splice extends Alt {}
+  class Seq extends PExpr {
+    factors: PExpr[];
+  }
+  class Iter extends PExpr {}
+  class Star extends Iter {}
+  class Plus extends Iter {}
+  class Opt extends Iter {}
+  class Not extends PExpr {}
+  class Lookahead extends PExpr {}
+  class Lex extends PExpr {}
+  class Apply extends PExpr {}
+  class UnicodeChar extends PExpr {}
+  class CaseInsensitiveTerminal extends PExpr {}
 
   /**
    * Matcher objects are used to incrementally match a changing input
@@ -307,7 +360,7 @@ declare namespace ohm {
     /**
      * True if Node is ? option
      */
-    isOptional: boolean;
+    isOptional(): boolean;
 
     /**
      * In addition to the properties defined above, within a given

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohm-js",
-  "version": "16.3.2",
+  "version": "16.4.0",
   "description": "An object-oriented language for parsing and pattern matching",
   "repository": "https://github.com/harc/ohm",
   "keywords": [
@@ -56,38 +56,39 @@
     "Tony Garnock-Jones <tonygarnockjones@gmail.com>",
     "Saketh Kasibatla <sake.kasi@gmail.com>",
     "Lionel Landwerlin <llandwerlin@gmail.com>",
-    "Jason Merrill <jwmerrill@gmail.com>",
     "Ray Toal <rtoal@lmu.edu>",
+    "Jason Merrill <jwmerrill@gmail.com>",
     "Yoshiki Ohshima <Yoshiki.Ohshima@acm.org>",
     "megabuz <3299889+megabuz@users.noreply.github.com>",
-    "stagas <gstagas@gmail.com>",
-    "Jonathan Edwards <JonathanMEdwards@gmail.com>",
     "Milan Lajtoš <milan.lajtos@me.com>",
     "Neil Jewers <njjewers@uwaterloo.ca>",
-    "Mike Niebling <(none)>",
-    "AngryPowman <angrypowman@qq.com>",
-    "Patrick Dubroy <patrick@sourcegraph.com>",
-    "Leslie Ying <acetophore@users.noreply.github.com>",
+    "Jonathan Edwards <JonathanMEdwards@gmail.com>",
+    "stagas <gstagas@gmail.com>",
+    "Daniel Tomlinson <DanielTomlinson@me.com>",
     "Pierre Donias <pierre.donias@gmail.com>",
-    "Justin Chase <justin.m.chase@gmail.com>",
-    "Ian Harris <ian@fofgof.xyz>",
+    "Casey Olson <casey.m.olson@gmail.com>",
+    "Arthur Carabott <arthurc@gmail.com>",
     "Stan Rozenraukh <stan@stanistan.com>",
     "Stephan Seidt <stephan.seidt@gmail.com>",
-    "Steve Phillips <steve@tryingtobeawesome.com>",
+    "Leslie Ying <acetophore@users.noreply.github.com>",
     "Szymon Kaliski <kaliskiszymon@gmail.com>",
     "Thomas Nyberg <tomnyberg@gmail.com>",
-    "Daniel Tomlinson <DanielTomlinson@me.com>",
+    "AngryPowman <angrypowman@qq.com>",
     "Vse Mozhet Byt <vsemozhetbyt@gmail.com>",
     "Wil Chung <10446+iamwilhelm@users.noreply.github.com>",
-    "Casey Olson <casey.m.olson@gmail.com>",
+    "Zachary Sakowitz <zsakowitz@gmail.com>",
     "abego <ub@abego-software.de>",
     "acslk <d_vd415@hotmail.com>",
     "codeZeilen <codeZeilen@users.noreply.github.com>",
     "kassadin <kassadin@foxmail.com>",
-    "Arthur Carabott <arthurc@gmail.com>",
     "owch <bowenrainyday@gmail.com>",
+    "sfinnie <scott.finnie@gmail.com>",
+    "Steve Phillips <steve@tryingtobeawesome.com>",
+    "Justin Chase <justin.m.chase@gmail.com>",
     "Luca Guzzon <luca.guzzon@gmail.com>",
-    "sfinnie <scott.finnie@gmail.com>"
+    "Ian Harris <ian@fofgof.xyz>",
+    "Mike Niebling <(none)>",
+    "Patrick Dubroy <patrick@sourcegraph.com>"
   ],
   "dependencies": {},
   "devDependencies": {

package/src/Grammar.js

@@ -140,7 +140,7 @@ Grammar.prototype = {
         if (k === '_iter' || k === '_nonterminal') {
           details =
             `it should use a rest parameter, e.g. \`${k}(...children) {}\`. ` +
-            'NOTE: this is new in Ohm v16 — see https://git.io/Jz4CI for details.';
+            'NOTE: this is new in Ohm v16 — see https://ohmjs.org/d/ati for details.';
         } else {
           details = `expected ${expected}, got ${actual}`;
         }

package/src/errors.js

@@ -168,7 +168,7 @@ function invalidParameter(ruleName, expr) {
 
 const syntacticVsLexicalNote =
   'NOTE: A _syntactic rule_ is a rule whose name begins with a capital letter. ' +
-  'See https://git.io/JiYgP for more details.';
+  'See https://ohmjs.org/d/svl for more details.';
 
 function applicationOfSyntacticRuleFromLexicalContext(ruleName, applyExpr) {
   return createError(
@@ -298,7 +298,7 @@ function missingSemanticAction(ctorName, name, type, stack) {
   if (ctorName === '_iter') {
     moreInfo = [
       '\nNOTE: as of Ohm v16, there is no default action for iteration nodes — see ',
-      '  https://git.io/JRwtG for details.',
+      '  https://ohmjs.org/d/dsa for details.',
     ].join('\n');
   }
 

package/src/main.js

@@ -295,13 +295,13 @@ function grammars(source, optNamespace) {
 
 function grammarFromScriptElement(optNode) {
   throw new Error(
-      'grammarFromScriptElement was removed in Ohm v16.0. See https://git.io/Jwow5 for more info.'
+      'grammarFromScriptElement was removed in Ohm v16.0. See https://ohmjs.org/d/gfs for more info.'
   );
 }
 
 function grammarsFromScriptElements(optNodeOrNodeList) {
   throw new Error(
-      'grammarsFromScriptElements was removed in Ohm v16.0. See https://git.io/Jwow5 for more info.'
+      'grammarsFromScriptElements was removed in Ohm v16.0. See https://ohmjs.org/d/gfs for more info.'
   );
 }