grammar-composer 0.6.2 → 0.7.0

package/dist/tests/test-grammars/XmlGrammar.js

@@ -75,9 +75,9 @@ const quotedString = R.anyOf([
     "'"
 ]);
 //////////////////////////////////////////////////////////////////////////////////////////////
-// Wrapped nonterminal names
+// Unfolded nonterminal list
 //////////////////////////////////////////////////////////////////////////////////////////////
-export const xmlGrammarUnwrappedNonterminalNames = [
+export const xmlGrammarUnfoldedNonterminalNames = [
     'openingTagStart',
     'tagEnd',
     'declarationTagOpening',

package/dist/tests/test-grammars/XmlGrammar.js.map

@@ -1 +1 @@
-{"version":3,"file":"XmlGrammar.js","sourceRoot":"","sources":["../../../src/tests/test-grammars/XmlGrammar.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"XmlGrammar.js","sourceRoot":"","sources":["../../../src/tests/test-grammars/XmlGrammar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,0BAA0B,CAAA;AAC7C,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAA;AAEpC,MAAM,OAAO,UAAU;IACtB,QAAQ,GAAG,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,UAAU,CACX,CAAC,CAAC,KAAK,CACN,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,cAAc,CACnB,CACD;KACD,CAAA;IAED,YAAY,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;KACjC,CAAC,CAAA;IAEF,UAAU,GAAG,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,eAAe;QAEpB,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC;QAE5B,IAAI,CAAC,MAAM;KACX,CAAA;IAED,eAAe,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACjC,GAAG;QAEH,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAEf,CAAC,CAAC,SAAS,CAAC,SAAS,EACpB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACxE;QAED,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;KAC1B,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACxB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE1B,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE7B,GAAG;KACH,CAAC,CAAA;IAEF,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3B,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE1B,CAAC,CAAC,SAAS,CAAC,eAAe,EAC1B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACxE;QAED,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE1B,CAAC,CAAC,QAAQ,CAAC;YACV,GAAG;YAEH,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;YAE1B,YAAY;YAEZ,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;SAC1B,CAAC;KACF,CAAC,CAAA;IAEF,UAAU,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC5B,IAAI;QAEJ,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE1B,CAAC,CAAC,SAAS,CAAC,SAAS,EACpB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACpD;QAED,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE1B,GAAG;KACH,CAAC,CAAA;IAEF,cAAc,GAAG,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,qBAAqB;QAE1B,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC;QAE1C,IAAI,CAAC,MAAM;KACX,CAAA;IAED,qBAAqB,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACvC,IAAI;QAEJ,CAAC,CAAC,SAAS,CAAC,SAAS,EACpB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAC9D;QAED,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;KAC1B,CAAC,CAAA;IAEF,uBAAuB,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACzC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE1B,CAAC,CAAC,KAAK,CACN,CAAC,CAAC,SAAS,CAAC,eAAe,EAC1B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACxE,EAED,YAAY,CACZ;QAED,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;KAC1B,CAAC,CAAA;IAEF,OAAO,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACzB,MAAM;QAEN,CAAC,CAAC,SAAS,CAAC,aAAa,EACxB,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,CAChC;QAED,KAAK;KACL,CAAC,CAAA;CACF;AAED,8FAA8F;AAC9F,6BAA6B;AAC7B,8FAA8F;AAC9F,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAC3B;IACC,GAAG;IACH,CAAC,CAAC,SAAS,CAAC,2BAA2B,EACtC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAClC;IACD,GAAG;CACH,EACD;IACC,GAAG;IACH,CAAC,CAAC,SAAS,CAAC,2BAA2B,EACtC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAClC;IACD,GAAG;CACH,CACD,CAAA;AAED,8FAA8F;AAC9F,4BAA4B;AAC5B,8FAA8F;AAC9F,MAAM,CAAC,MAAM,kCAAkC,GAA0C;IACxF,iBAAiB;IACjB,QAAQ;IACR,uBAAuB;CACvB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "grammar-composer",
-	"version": "0.6.2",
+	"version": "0.7.0",
 	"description": "Creates and generates parsers from composable grammar definitions. Includes advanced features like lexer-free parsing, selective packrat memoization and static analysis.",
 	"author": "Rotem Dan",
 	"license": "MIT",
@@ -36,7 +36,7 @@
 		"regexp-composer": "~0.6.1"
 	},
 	"devDependencies": {
-		"@types/node": "~26.4.0",
+		"@types/node": "~26.4.1",
 		"vitest": "~4.1.11"
 	}
 }

package/src/parser/Builder.ts

@@ -1,7 +1,7 @@
 import { isArray, isFunction, isString } from '../utilities/Utilities.js'
 
 import { detectAndAnnotateOptionalNodes, detectAndErrorOnLeftRecursion } from './StaticAnalysis.js'
-import { Grammar, Nonterminal, GrammarElement, StringTerminal, Sequence, NonterminalReference, Production } from './Grammar.js'
+import { Grammar, Nonterminal, GrammarNode, StringTerminal, Sequence, NonterminalReference, GrammarExpression } from './Grammar.js'
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Grammar builder method
@@ -12,7 +12,7 @@ export function buildGrammar<T extends GrammarDefinition>(
 	options?: GrammarBuilderOptions<T>): Grammar<T> {
 
 	options = {
-		unwrappedNonterminalNames: [],
+		unfoldedNonterminalNames: [],
 		...options
 	}
 
@@ -34,10 +34,10 @@ export function buildGrammar<T extends GrammarDefinition>(
 		}
 
 		const productionContent = objectProperty.call(definitionObject)
-		const normalizedProduction = productionToGrammarElement(productionContent)
-		const isUnwrappedNonterminal = options.unwrappedNonterminalNames?.includes(key) === true
+		const productionContentNode = grammarExpressionToNode(productionContent)
+		const isUnfoldedNonterminal = options.unfoldedNonterminalNames?.includes(key) === true
 
-		const newNonterminal = nonterminal(key, normalizedProduction, isUnwrappedNonterminal)
+		const newNonterminal = nonterminal(key, productionContentNode, isUnfoldedNonterminal)
 		const newOptionalNonterminal = {
 			...newNonterminal,
 			optional: true,
@@ -57,7 +57,7 @@ export function buildGrammar<T extends GrammarDefinition>(
 	}
 
 	for (const [func, nonterminal] of nonterminalLookup) {
-		const preparedContent = prepareGrammarElement(
+		const preparedContent = prepareGrammarNode(
 			nonterminal.content,
 			nonterminalLookup,
 			optionalNonterminalLookup,
@@ -97,73 +97,73 @@ export function buildGrammar<T extends GrammarDefinition>(
 	)
 }
 
-function prepareGrammarElement(
-	rootElement: GrammarElement,
+function prepareGrammarNode(
+	rootNode: GrammarNode,
 	nonterminalLookup: Map<Function, Nonterminal>,
 	optionalNonterminalLookup: Map<Function, Nonterminal>,
 	getNewCacheId: () => number
-): GrammarElement {
-	function prepare(element: GrammarElement): GrammarElement {
-		const setCacheIdIfNeeded = (element: GrammarElement) => {
-			if (element.cached === true) {
-				element.cacheId = getNewCacheId()
+): GrammarNode {
+	function prepare(node: GrammarNode): GrammarNode {
+		const setCacheIdIfNeeded = (node: GrammarNode) => {
+			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: Nonterminal | undefined
 
-				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 {
 					return nonterminal
@@ -172,7 +172,7 @@ function prepareGrammarElement(
 		}
 	}
 
-	return prepare(rootElement)
+	return prepare(rootNode)
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -192,7 +192,7 @@ function stringTerminal(content: string): StringTerminal {
 	}
 }
 
-function nonterminal(name: string, content: GrammarElement, unwrapped: boolean): Nonterminal {
+function nonterminal(name: string, content: GrammarNode, unfolded: boolean): Nonterminal {
 	if (name.length < 1) {
 		throw new Error(`A nonterminal name must include at least 1 character.`)
 	}
@@ -204,11 +204,11 @@ function nonterminal(name: string, content: GrammarElement, unwrapped: boolean):
 
 		optional: false,
 		cached: false,
-		unwrapped,
+		unfolded,
 	}
 }
 
-function sequence(members: GrammarElement[]): Sequence {
+function sequence(members: GrammarNode[]): Sequence {
 	return {
 		type: 'Sequence',
 		members,
@@ -218,27 +218,27 @@ function sequence(members: GrammarElement[]): Sequence {
 	}
 }
 
-function unresolvedReference(reference: Function): NonterminalReference {
+function unresolvedNonterminalReference(nonterminalReferenceFunction: Function): NonterminalReference {
 	return {
 		type: 'NonterminalReference',
-		reference,
+		reference: nonterminalReferenceFunction,
 		optional: false,
 
 		cached: false,
 	}
 }
 
-export function productionToGrammarElement(production: Production): GrammarElement {
-	if (isString(production)) {
-		return stringTerminal(production)
-	} else if (isArray(production)) {
-		const normalizedMembers = production.map(element => productionToGrammarElement(element))
+export function grammarExpressionToNode(grammarExpression: GrammarExpression): GrammarNode {
+	if (isString(grammarExpression)) {
+		return stringTerminal(grammarExpression)
+	} else if (isArray(grammarExpression)) {
+		const memberNodes = grammarExpression.map(member => grammarExpressionToNode(member))
 
-		return sequence(normalizedMembers)
-	} else if (isFunction(production)) {
-		return unresolvedReference(production)
+		return sequence(memberNodes)
+	} else if (isFunction(grammarExpression)) {
+		return unresolvedNonterminalReference(grammarExpression)
 	} else {
-		return production
+		return grammarExpression
 	}
 }
 
@@ -246,7 +246,7 @@ export function productionToGrammarElement(production: Production): GrammarEleme
 // Builder type definitions
 /////////////////////////////////////////////////////////////////////////////////////////////////
 export interface GrammarBuilderOptions<T> {
-	unwrappedNonterminalNames?: GrammarNonterminalNames<T>
+	unfoldedNonterminalNames?: GrammarNonterminalNames<T>
 }
 
 export type GrammarNonterminalNames<T> = (keyof T)[]

package/src/parser/Grammar.ts

@@ -3,7 +3,7 @@ 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
@@ -28,7 +28,7 @@ export class Grammar<T> {
 		return parse(text, this)
 	}
 
-	get rootElement() {
+	get rootNode() {
 		return this.productions[this.startProductionName]
 	}
 }
@@ -36,50 +36,50 @@ export class Grammar<T> {
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Exported grammar builder functions
 /////////////////////////////////////////////////////////////////////////////////////////////////
-export function zeroOrMore(content: Production): Repetition {
+export function zeroOrMore(content: GrammarExpression): Repetition {
 	return {
 		type: 'Repetition',
-		content: productionToGrammarElement(content),
+		content: grammarExpressionToNode(content),
 		optional: true,
 		cached: false,
 	}
 }
 
-export function oneOrMore(content: Production): Repetition {
+export function oneOrMore(content: GrammarExpression): Repetition {
 	return {
 		type: 'Repetition',
-		content: productionToGrammarElement(content),
+		content: grammarExpressionToNode(content),
 		optional: false,
 		cached: false,
 	}
 }
 
-export function anyOf(...members: Production[]): Choice {
+export function anyOf(...members: GrammarExpression[]): Choice {
 	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,
 	}
 }
 
-export function bestOf(...members: Production[]): Choice {
+export function bestOf(...members: GrammarExpression[]): Choice {
 	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,
 
@@ -87,8 +87,8 @@ export function bestOf(...members: Production[]): Choice {
 	}
 }
 
-export function possibly<T extends Production>(content: Production): T {
-	return { ...productionToGrammarElement(content), optional: true } as T
+export function possibly<T extends GrammarExpression>(content: GrammarExpression): T {
+	return { ...grammarExpressionToNode(content), optional: true } as T
 }
 
 export function pattern(pattern: Pattern): PatternTerminal {
@@ -113,20 +113,20 @@ export function pattern(pattern: Pattern): PatternTerminal {
 	}
 }
 
-export function cached<T extends Production>(content: Production): T {
-	return { ...productionToGrammarElement(content), cached: true } as T
+export function cached<T extends GrammarExpression>(content: GrammarExpression): T {
+	return { ...grammarExpressionToNode(content), cached: true } as T
 }
 
-export function uncached<T extends Production>(content: Production): T {
-	return { ...productionToGrammarElement(content), cached: false } as T
+export function uncached<T extends GrammarExpression>(content: GrammarExpression): T {
+	return { ...grammarExpressionToNode(content), cached: false } as T
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Type definitions
 /////////////////////////////////////////////////////////////////////////////////////////////////
-export type Production = string | GrammarElement | (() => Production) | Production[]
+export type GrammarExpression = string | GrammarNode | (() => GrammarExpression) | GrammarExpression[]
 
-export type GrammarElement =
+export type GrammarNode =
 	StringTerminal |
 	PatternTerminal |
 	Nonterminal |
@@ -135,60 +135,60 @@ export type GrammarElement =
 	Choice |
 	NonterminalReference
 
-interface GrammarElementBase {
+interface GrammarNodeBase {
 	type: string
 	optional: boolean
 
 	cached: boolean
 	cacheId?: number
 
-	// The name of the grammar property this element was assigned to, if any.
-	// Used by the parser to refer to the element by name in error messages.
+	// The name of the grammar property this node was assigned to, if any.
+	// Used by the parser to refer to the node by name in error messages.
 	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
 	regExp: RegExp
 }
 
-export interface Nonterminal extends GrammarElementBase {
+export interface Nonterminal extends GrammarNodeBase {
 	type: 'Nonterminal'
 	name: string
-	content: GrammarElement
-	unwrapped: boolean
+	content: GrammarNode
+	unfolded: boolean
 
 	// The canonical nonterminal as defined in the grammar. Clones created for
 	// optional references and cached references keep a reference to the original,
 	// so identity comparisons work across clones.
-	grammarNonterminal?: Nonterminal
+	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/src/parser/ParseError.ts

@@ -1,6 +1,6 @@
 import type { Nonterminal, Terminal } from './Grammar.js'
 import { buildCaretSpacing, expandTabs, getLineAndColumn } from '../utilities/LineAndColumn.js'
-import { escapeChar, TerminalToText } from './TerminalToText.js'
+import { escapeChar, TerminalFormatter } from './TerminalFormatter.js'
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 // Parse error class
@@ -145,10 +145,10 @@ function isRedundantCandidate(candidate: TerminalCandidate, candidates: Terminal
 
 // Compares nonterminals by their canonical grammar reference, because the same
 // production can be represented by multiple cloned instances during a parse.
-function stackIndexOf(productionStack: Nonterminal[], production: Nonterminal): number {
-	const canonical = production.grammarNonterminal ?? production
+function stackIndexOf(productionStack: Nonterminal[], nonterminal: Nonterminal): number {
+	const canonicalNonterminal = nonterminal.canonicalNonterminal ?? nonterminal
 
-	return productionStack.findIndex(nonterminal => (nonterminal.grammarNonterminal ?? nonterminal) === canonical)
+	return productionStack.findIndex(nonterminal => (nonterminal.canonicalNonterminal ?? nonterminal) === canonicalNonterminal)
 }
 
 function areTerminalsEqual(a: any, b: any): boolean {
@@ -193,7 +193,7 @@ function stringifyFailedTerminal(failedMatch: FailedMatch): string {
 	}
 
 	const stringifiedLengthLimit = 100
-	const terminalToText = new TerminalToText(stringifiedLengthLimit)
+	const terminalToText = new TerminalFormatter(stringifiedLengthLimit)
 
 	return terminalToText.stringifyTerminal(terminal)
 }
@@ -236,7 +236,7 @@ function findCommonProductionPrefix(productionStacks: Nonterminal[][]): Nontermi
 }
 
 function areSameNonterminal(a: Nonterminal, b: Nonterminal): boolean {
-	return (a.grammarNonterminal ?? a) === (b.grammarNonterminal ?? b)
+	return (a.canonicalNonterminal ?? a) === (b.canonicalNonterminal ?? b)
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////