grammar-composer 0.6.2 → 0.7.1

package/README.md

@@ -5,7 +5,7 @@ A library to define, build and efficiently parse context-free grammars.
 * Grammars are defined using TypeScript class declarations
 * No tokenization stage. The generated parser accepts raw characters as input, meaning it's a form of lexer-free, hybrid parser, supporting contextual low-level parsing. This means low-level character patterns, recognized by a regular language, can be specialized to various high-level parser contexts, and sub-patterns captured in low-level regular expressions are directly embedded as part of the resulting parse tree
 * Raw character parsing is defined as part of the grammar via embedded `Pattern` objects that are internally processed through the [`regexp-composer`](https://github.com/rotemdan/regexp-composer) regular expression library. This means that any subset of the grammar that can be stated as a regular grammar can be moved to be parsed using the highly optimized native JavaScript RegExp engine, instead of being parsed via the slower context-free parser
-* Top-down parsing (roughly equivalent to PEG parsing), with optional "packrat" caching that can be enabled or disabled for individual productions or more specific grammar elements
+* Top-down parsing (roughly equivalent to PEG parsing), with optional "packrat" caching that can be enabled or disabled for individual productions or more specific grammar expressions
 * Supports right-recursion, but will currently error when left-recursion is detected
 * Uses sophisticated static analysis to automatically identify and annotate optional productions
 * Provides useful parse-time error reporting, identifying the exact production involved and most likely alternatives at the failed position
@@ -179,9 +179,17 @@ const quotedString = R.anyOf(
 )
 
 //////////////////////////////////////////////////////////////////////////////////////////////
-// Wrapped nonterminal names
+// Unfolded nonterminal list
+//
+// Nonterminals placed here will be "transparent" in the resulting parse tree.
+//
+// Their content would be absorbed by their parent.
+//
+// This is useful for the purpose of simplifying the resulting parse tree, and
+// removing non-semantic "technical" nodes used for things like grammar optimization
+// and refactoring.
 //////////////////////////////////////////////////////////////////////////////////////////////
-export const xmlGrammarUnwrappedNonterminalNames: G.GrammarNonterminalNames<XmlGrammar> = [
+export const xmlGrammarUnfoldedNonterminalNames: G.GrammarNonterminalNames<XmlGrammar> = [
 	'openingTagStart',
 	'tagEnd',
 	'declarationTagOpening',
@@ -192,7 +200,7 @@ export const xmlGrammarUnwrappedNonterminalNames: G.GrammarNonterminalNames<XmlG
 
 ```ts
 import { buildGrammar } from 'grammar-composer'
-import { XmlGrammar, xmlGrammarUnwrappedNonterminalNames } from './XmlGrammar.js'
+import { XmlGrammar, xmlGrammarUnfoldedNonterminalNames } from './XmlGrammar.js'
 
 	const xmlString = `
 <!DOCTYPE web-app>
@@ -213,7 +221,7 @@ const grammar = buildGrammar(RegExpGrammar, 'root', {
     // "passed through" when the parse tree is built,
     // meaning they would not appear in the parse tree
     // and their child nodes would be absorbed into their ancestor nodes.
-    unwrappedNonterminalNames: xmlGrammarUnwrappedNonterminalNames
+    unfoldedNonterminalNames: xmlGrammarUnfoldedNonterminalNames
 })
 
 // Parse the XML string with the built grammar
@@ -417,37 +425,37 @@ The resulting parse tree looks like:
 
 Context-free operators are mostly named similarly to the ones in [`regexp-composer`](https://github.com/rotemdan/regexp-composer).
 
-### `zeroOrMore(grammarElement)`
+### `zeroOrMore(grammarExpression)`
 
-Match the grammar element zero or more times.
+Match the grammar expression zero or more times.
 
-### `oneOrMore(grammarElement)`
+### `oneOrMore(grammarExpression)`
 
-Match the grammar element one or more times.
+Match the grammar expression one or more times.
 
-### `anyOf(grammarElement1, grammarElement2, grammarElement3, ...)`
+### `anyOf(grammarExpression1, grammarExpression2, grammarExpression3, ...)`
 
-Match any of the grammar elements. The first successful match, in order, would be accepted without trying subsequent ones.
+Match any of the grammar expressions. The first successful match, in order, would be accepted without trying subsequent ones.
 
-### `bestOf(grammarElement1, grammarElement2, grammarElement3, ...)`
+### `bestOf(grammarExpression1, grammarExpression2, grammarExpression3, ...)`
 
-Match the best grammar element. All possibilities would be tried, and the the longest match (in terms of character count) would be chosen.
+Match the best grammar expression. All possibilities would be tried, and the the longest match (in terms of character count) would be chosen.
 
-### `possibly(grammarElement)`
+### `possibly(grammarExpression)`
 
-Optionally accept the grammar element, or skip if it doesn't match.
+Optionally accept the grammar expression, or skip if it doesn't match.
 
 ### `pattern(regexpPattern)`
 
 Accept a regular expression pattern compatible with `regexp-composer` `Pattern` type (either a simple string, pattern object, or array of pattern objects).
 
-### `cached(grammarElement)`
+### `cached(grammarExpression)`
 
-Store the result of parsing using this grammar element and reuse when it's subsequently evaluated **at the same text position**.
+Store the parsed result of this grammar expression and reuse it when it's subsequently evaluated **at the same text position**.
 
-### `uncached(grammarElement)`
+### `uncached(grammarExpression)`
 
-Don't cache this grammar element.
+Don't cache this grammar expression.
 
 ## License
 

package/dist/parser/Builder.d.ts

@@ -1,8 +1,8 @@
-import { Grammar, GrammarElement, Production } from './Grammar.js';
+import { Grammar, GrammarNode, GrammarExpression } from './Grammar.js';
 export declare function buildGrammar<T extends GrammarDefinition>(definitionObject: T | (new () => T), startProductionName: keyof T, options?: GrammarBuilderOptions<T>): Grammar<T>;
-export declare function productionToGrammarElement(production: Production): GrammarElement;
+export declare function grammarExpressionToNode(grammarExpression: GrammarExpression): GrammarNode;
 export interface GrammarBuilderOptions<T> {
-    unwrappedNonterminalNames?: GrammarNonterminalNames<T>;
+    unfoldedNonterminalNames?: GrammarNonterminalNames<T>;
 }
 export type GrammarNonterminalNames<T> = (keyof T)[];
 export type GrammarDefinition = {

package/dist/parser/Builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/parser/Builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAe,cAAc,EAAkD,UAAU,EAAE,MAAM,cAAc,CAAA;AAK/H,wBAAgB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EACvD,gBAAgB,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EACnC,mBAAmB,EAAE,MAAM,CAAC,EAC5B,OAAO,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAsF/C;AAqID,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,UAAU,GAAG,cAAc,CAYjF;AAKD,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACvC,yBAAyB,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAA;CACtD;AAED,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;AAEpD,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAA"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../src/parser/Builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAe,WAAW,EAAkD,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAKnI,wBAAgB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EACvD,gBAAgB,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EACnC,mBAAmB,EAAE,MAAM,CAAC,EAC5B,OAAO,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAsF/C;AAqID,wBAAgB,uBAAuB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,WAAW,CAYzF;AAKD,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACvC,wBAAwB,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAA;CACrD;AAED,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;AAEpD,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAA"}

package/dist/parser/Builder.js

@@ -6,7 +6,7 @@ import { Grammar } from './Grammar.js';
 /////////////////////////////////////////////////////////////////////////////////////////////////
 export function buildGrammar(definitionObject, startProductionName, options) {
     options = {
-        unwrappedNonterminalNames: [],
+        unfoldedNonterminalNames: [],
         ...options
     };
     if (isFunction(definitionObject)) {
@@ -22,9 +22,9 @@ export function buildGrammar(definitionObject, startProductionName, options) {
             throw new Error(`Grammar definition contains a property '${key}', which is not a function. All object properties must be productions, declared as functions.`);
         }
         const productionContent = objectProperty.call(definitionObject);
-        const normalizedProduction = productionToGrammarElement(productionContent);
-        const isUnwrappedNonterminal = options.unwrappedNonterminalNames?.includes(key) === true;
-        const newNonterminal = nonterminal(key, normalizedProduction, isUnwrappedNonterminal);
+        const productionContentNode = grammarExpressionToNode(productionContent);
+        const isUnfoldedNonterminal = options.unfoldedNonterminalNames?.includes(key) === true;
+        const newNonterminal = nonterminal(key, productionContentNode, isUnfoldedNonterminal);
         const newOptionalNonterminal = {
             ...newNonterminal,
             optional: true,
@@ -40,7 +40,7 @@ export function buildGrammar(definitionObject, startProductionName, options) {
         return newCacheId;
     };
     for (const [func, nonterminal] of nonterminalLookup) {
-        const preparedContent = prepareGrammarElement(nonterminal.content, nonterminalLookup, optionalNonterminalLookup, getNewCacheId);
+        const preparedContent = prepareGrammarNode(nonterminal.content, nonterminalLookup, optionalNonterminalLookup, getNewCacheId);
         nonterminal.content = preparedContent;
         const optionalNonterminal = optionalNonterminalLookup.get(func);
         // The optional wrapper should share the already-resolved content
@@ -62,57 +62,57 @@ export function buildGrammar(definitionObject, startProductionName, options) {
     }
     return new Grammar(nonterminals, startProductionName, cacheIdCounter);
 }
-function prepareGrammarElement(rootElement, nonterminalLookup, optionalNonterminalLookup, getNewCacheId) {
-    function prepare(element) {
-        const setCacheIdIfNeeded = (element) => {
-            if (element.cached === true) {
-                element.cacheId = getNewCacheId();
+function prepareGrammarNode(rootNode, nonterminalLookup, optionalNonterminalLookup, getNewCacheId) {
+    function prepare(node) {
+        const setCacheIdIfNeeded = (node) => {
+            if (node.cached === true) {
+                node.cacheId = getNewCacheId();
             }
-            return element;
+            return node;
         };
-        switch (element.type) {
+        switch (node.type) {
             case 'StringTerminal':
             case 'Nonterminal': {
                 return setCacheIdIfNeeded({
-                    ...element
+                    ...node
                 });
             }
             case 'PatternTerminal': {
                 return setCacheIdIfNeeded({
-                    ...element,
+                    ...node,
                 });
             }
             case 'Repetition': {
                 return setCacheIdIfNeeded({
-                    ...element,
-                    content: prepare(element.content),
+                    ...node,
+                    content: prepare(node.content),
                 });
             }
             case 'Sequence':
             case 'Choice': {
                 return setCacheIdIfNeeded({
-                    ...element,
-                    members: element.members.map(element => prepare(element)),
+                    ...node,
+                    members: node.members.map(member => prepare(member)),
                 });
             }
             case 'NonterminalReference': {
-                const reference = element.reference;
+                const reference = node.reference;
                 let nonterminal;
-                if (element.optional) {
+                if (node.optional) {
                     nonterminal = optionalNonterminalLookup.get(reference);
                 }
                 else {
                     nonterminal = nonterminalLookup.get(reference);
                 }
                 if (!nonterminal) {
-                    throw new Error(`Couldn't resolve function reference in grammar element: ${JSON.stringify(element)}`);
+                    throw new Error(`Couldn't resolve function reference in grammar node: ${JSON.stringify(node)}`);
                 }
-                if (element.cached === true) {
+                if (node.cached === true) {
                     return {
                         ...nonterminal,
                         cached: true,
                         cacheId: getNewCacheId(),
-                        grammarNonterminal: nonterminal.grammarNonterminal ?? nonterminal
+                        canonicalNonterminal: nonterminal.canonicalNonterminal ?? nonterminal
                     };
                 }
                 else {
@@ -121,7 +121,7 @@ function prepareGrammarElement(rootElement, nonterminalLookup, optionalNontermin
             }
         }
     }
-    return prepare(rootElement);
+    return prepare(rootNode);
 }
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Internal AST builder methods
@@ -137,7 +137,7 @@ function stringTerminal(content) {
         cached: false,
     };
 }
-function nonterminal(name, content, unwrapped) {
+function nonterminal(name, content, unfolded) {
     if (name.length < 1) {
         throw new Error(`A nonterminal name must include at least 1 character.`);
     }
@@ -147,7 +147,7 @@ function nonterminal(name, content, unwrapped) {
         content,
         optional: false,
         cached: false,
-        unwrapped,
+        unfolded,
     };
 }
 function sequence(members) {
@@ -158,27 +158,27 @@ function sequence(members) {
         cached: false,
     };
 }
-function unresolvedReference(reference) {
+function unresolvedNonterminalReference(nonterminalReferenceFunction) {
     return {
         type: 'NonterminalReference',
-        reference,
+        reference: nonterminalReferenceFunction,
         optional: false,
         cached: false,
     };
 }
-export function productionToGrammarElement(production) {
-    if (isString(production)) {
-        return stringTerminal(production);
+export function grammarExpressionToNode(grammarExpression) {
+    if (isString(grammarExpression)) {
+        return stringTerminal(grammarExpression);
     }
-    else if (isArray(production)) {
-        const normalizedMembers = production.map(element => productionToGrammarElement(element));
-        return sequence(normalizedMembers);
+    else if (isArray(grammarExpression)) {
+        const memberNodes = grammarExpression.map(member => grammarExpressionToNode(member));
+        return sequence(memberNodes);
     }
-    else if (isFunction(production)) {
-        return unresolvedReference(production);
+    else if (isFunction(grammarExpression)) {
+        return unresolvedNonterminalReference(grammarExpression);
     }
     else {
-        return production;
+        return grammarExpression;
     }
 }
 //# sourceMappingURL=Builder.js.map

package/dist/parser/Builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../src/parser/Builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../src/parser/Builder.ts"],"names":[],"mappings":"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"}

package/dist/parser/Grammar.d.ts

@@ -1,23 +1,23 @@
-import { Pattern } from 'regexp-composer';
+import { PatternExpression } from 'regexp-composer';
 export declare class Grammar<T> {
     readonly productions: Record<keyof T, any>;
     readonly startProductionName: keyof T;
     readonly maxCacheId: number;
     constructor(productions: Record<keyof T, any>, startProductionName: keyof T, maxCacheId: number);
     parse(text: string): import("./Parser.js").ParseTreeNode[];
-    get rootElement(): Record<keyof T, any>[keyof T];
-}
-export declare function zeroOrMore(content: Production): Repetition;
-export declare function oneOrMore(content: Production): Repetition;
-export declare function anyOf(...members: Production[]): Choice;
-export declare function bestOf(...members: Production[]): Choice;
-export declare function possibly<T extends Production>(content: Production): T;
-export declare function pattern(pattern: Pattern): PatternTerminal;
-export declare function cached<T extends Production>(content: Production): T;
-export declare function uncached<T extends Production>(content: Production): T;
-export type Production = string | GrammarElement | (() => Production) | Production[];
-export type GrammarElement = StringTerminal | PatternTerminal | Nonterminal | Sequence | Repetition | Choice | NonterminalReference;
-interface GrammarElementBase {
+    get rootNode(): Record<keyof T, any>[keyof T];
+}
+export declare function zeroOrMore(content: GrammarExpression): Repetition;
+export declare function oneOrMore(content: GrammarExpression): Repetition;
+export declare function anyOf(...members: GrammarExpression[]): Choice;
+export declare function bestOf(...members: GrammarExpression[]): Choice;
+export declare function possibly<T extends GrammarExpression>(content: GrammarExpression): T;
+export declare function pattern(patternExpression: PatternExpression): PatternTerminal;
+export declare function cached<T extends GrammarExpression>(content: GrammarExpression): T;
+export declare function uncached<T extends GrammarExpression>(content: GrammarExpression): T;
+export type GrammarExpression = string | GrammarNode | (() => GrammarExpression) | GrammarExpression[];
+export type GrammarNode = StringTerminal | PatternTerminal | Nonterminal | Sequence | Repetition | Choice | NonterminalReference;
+interface GrammarNodeBase {
     type: string;
     optional: boolean;
     cached: boolean;
@@ -25,36 +25,36 @@ interface GrammarElementBase {
     name?: string;
 }
 export type Terminal = StringTerminal | PatternTerminal;
-export interface StringTerminal extends GrammarElementBase {
+export interface StringTerminal extends GrammarNodeBase {
     type: 'StringTerminal';
     content: string;
 }
-export interface PatternTerminal extends GrammarElementBase {
+export interface PatternTerminal extends GrammarNodeBase {
     type: 'PatternTerminal';
-    pattern: Pattern;
+    pattern: PatternExpression;
     regExp: RegExp;
 }
-export interface Nonterminal extends GrammarElementBase {
+export interface Nonterminal extends GrammarNodeBase {
     type: 'Nonterminal';
     name: string;
-    content: GrammarElement;
-    unwrapped: boolean;
-    grammarNonterminal?: Nonterminal;
+    content: GrammarNode;
+    unfolded: boolean;
+    canonicalNonterminal?: Nonterminal;
 }
-export interface Sequence extends GrammarElementBase {
+export interface Sequence extends GrammarNodeBase {
     type: 'Sequence';
-    members: GrammarElement[];
+    members: GrammarNode[];
 }
-export interface Repetition extends GrammarElementBase {
+export interface Repetition extends GrammarNodeBase {
     type: 'Repetition';
-    content: GrammarElement;
+    content: GrammarNode;
 }
-export interface Choice extends GrammarElementBase {
+export interface Choice extends GrammarNodeBase {
     type: 'Choice';
-    members: GrammarElement[];
+    members: GrammarNode[];
     exhaustive: boolean;
 }
-export interface NonterminalReference extends GrammarElementBase {
+export interface NonterminalReference extends GrammarNodeBase {
     type: 'NonterminalReference';
     reference: Function;
 }

package/dist/parser/Grammar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Grammar.d.ts","sourceRoot":"","sources":["../../src/parser/Grammar.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Grammar.d.ts","sourceRoot":"","sources":["../../src/parser/Grammar.ts"],"names":[],"mappings":"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"}

package/dist/parser/Grammar.js

@@ -2,7 +2,7 @@ import { buildRegExp, inputStart, isPatternOptional } from 'regexp-composer';
 import { isArray } from '../utilities/Utilities.js';
 import { parse } from './Parser.js';
 import { validatePatternCaptureGroups } from './StaticAnalysis.js';
-import { productionToGrammarElement } from './Builder.js';
+import { grammarExpressionToNode } from './Builder.js';
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Grammar class
 /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@ export class Grammar {
     parse(text) {
         return parse(text, this);
     }
-    get rootElement() {
+    get rootNode() {
         return this.productions[this.startProductionName];
     }
 }
@@ -28,7 +28,7 @@ export class Grammar {
 export function zeroOrMore(content) {
     return {
         type: 'Repetition',
-        content: productionToGrammarElement(content),
+        content: grammarExpressionToNode(content),
         optional: true,
         cached: false,
     };
@@ -36,7 +36,7 @@ export function zeroOrMore(content) {
 export function oneOrMore(content) {
     return {
         type: 'Repetition',
-        content: productionToGrammarElement(content),
+        content: grammarExpressionToNode(content),
         optional: false,
         cached: false,
     };
@@ -45,10 +45,10 @@ export function anyOf(...members) {
     if (members.length === 0) {
         throw new Error(`'anyOf' requires at least one member.`);
     }
-    const normalizedMembers = members.map(member => productionToGrammarElement(member));
+    const memberNodes = members.map(member => grammarExpressionToNode(member));
     return {
         type: 'Choice',
-        members: normalizedMembers,
+        members: memberNodes,
         optional: false,
         exhaustive: false,
         cached: false,
@@ -58,40 +58,40 @@ export function bestOf(...members) {
     if (members.length === 0) {
         throw new Error(`'bestOf' requires at least one member.`);
     }
-    const normalizedMembers = members.map(member => productionToGrammarElement(member));
+    const memberNodes = members.map(member => grammarExpressionToNode(member));
     return {
         type: 'Choice',
-        members: normalizedMembers,
+        members: memberNodes,
         optional: false,
         exhaustive: true,
         cached: false,
     };
 }
 export function possibly(content) {
-    return { ...productionToGrammarElement(content), optional: true };
+    return { ...grammarExpressionToNode(content), optional: true };
 }
-export function pattern(pattern) {
-    if (isArray(pattern)) {
-        pattern = [inputStart, ...pattern];
+export function pattern(patternExpression) {
+    if (isArray(patternExpression)) {
+        patternExpression = [inputStart, ...patternExpression];
     }
     else {
-        pattern = [inputStart, pattern];
+        patternExpression = [inputStart, patternExpression];
     }
-    validatePatternCaptureGroups(pattern);
-    const regExp = buildRegExp(pattern);
-    const optional = isPatternOptional(pattern);
+    validatePatternCaptureGroups(patternExpression);
+    const regExp = buildRegExp(patternExpression);
+    const optional = isPatternOptional(patternExpression);
     return {
         type: 'PatternTerminal',
-        pattern,
+        pattern: patternExpression,
         regExp,
         optional,
         cached: false,
     };
 }
 export function cached(content) {
-    return { ...productionToGrammarElement(content), cached: true };
+    return { ...grammarExpressionToNode(content), cached: true };
 }
 export function uncached(content) {
-    return { ...productionToGrammarElement(content), cached: false };
+    return { ...grammarExpressionToNode(content), cached: false };
 }
 //# sourceMappingURL=Grammar.js.map

package/dist/parser/Grammar.js.map

@@ -1 +1 @@
-{"version":3,"file":"Grammar.js","sourceRoot":"","sources":["../../src/parser/Grammar.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Grammar.js","sourceRoot":"","sources":["../../src/parser/Grammar.ts"],"names":[],"mappings":"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"}

package/dist/parser/ParseError.js

@@ -1,5 +1,5 @@
 import { buildCaretSpacing, expandTabs, getLineAndColumn } from '../utilities/LineAndColumn.js';
-import { escapeChar, TerminalToText } from './TerminalToText.js';
+import { escapeChar, TerminalFormatter } from './TerminalFormatter.js';
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Parse error class
 /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -108,9 +108,9 @@ function isRedundantCandidate(candidate, candidates) {
 }
 // Compares nonterminals by their canonical grammar reference, because the same
 // production can be represented by multiple cloned instances during a parse.
-function stackIndexOf(productionStack, production) {
-    const canonical = production.grammarNonterminal ?? production;
-    return productionStack.findIndex(nonterminal => (nonterminal.grammarNonterminal ?? nonterminal) === canonical);
+function stackIndexOf(productionStack, nonterminal) {
+    const canonicalNonterminal = nonterminal.canonicalNonterminal ?? nonterminal;
+    return productionStack.findIndex(nonterminal => (nonterminal.canonicalNonterminal ?? nonterminal) === canonicalNonterminal);
 }
 function areTerminalsEqual(a, b) {
     if (a === b) {
@@ -145,7 +145,7 @@ function stringifyFailedTerminal(failedMatch) {
         }
     }
     const stringifiedLengthLimit = 100;
-    const terminalToText = new TerminalToText(stringifiedLengthLimit);
+    const terminalToText = new TerminalFormatter(stringifiedLengthLimit);
     return terminalToText.stringifyTerminal(terminal);
 }
 /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -177,7 +177,7 @@ function findCommonProductionPrefix(productionStacks) {
     return commonPrefix;
 }
 function areSameNonterminal(a, b) {
-    return (a.grammarNonterminal ?? a) === (b.grammarNonterminal ?? b);
+    return (a.canonicalNonterminal ?? a) === (b.canonicalNonterminal ?? b);
 }
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Parse error helpers