parser-lr 0.7.0 → 0.8.0

package/bin/parser-lr.js

@@ -3781,7 +3781,7 @@ const {
   Help,
 } = commander;
 
-var version$1 = "0.7.0";
+var version$1 = "0.8.0";
 var packageDefinition = {
 	version: version$1};
 
@@ -8241,8 +8241,11 @@ function parseExpressionNode(node) {
  * @param node - `choice` CST node.
  */
 function parseChoice(node) {
+    // Parse each labeled or unlabeled alternative.
     const alternatives = collectAlternatives(node).map(parseLabeledAlternative);
-    if (alternatives.length === 1) {
+    // Collapse a sole unlabeled alternative; keep labeled singles as a choice
+    // so AST / transform variants remain visible to validation and consumers.
+    if (alternatives.length === 1 && alternatives[0].label === null) {
         return alternatives[0].expression;
     }
     return {
@@ -13126,134 +13129,35 @@ var gotos = [
 var ast = [
 	{
 		name: "grammar_file",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "name_decl"
-				},
-				{
-					kind: "repeat",
-					element: {
-						kind: "reference",
-						name: "section"
-					}
-				},
-				{
-					kind: "reference",
-					name: "start_decl"
-				},
-				{
-					kind: "reference",
-					name: "grammar_section"
-				},
-				{
-					kind: "optional",
-					element: {
-						kind: "reference",
-						name: "ast_section"
-					}
-				},
-				{
-					kind: "optional",
-					element: {
-						kind: "reference",
-						name: "transform_section"
-					}
-				}
-			]
-		}
-	},
-	{
-		name: "name_decl",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "name_kw"
-				},
-				{
-					kind: "reference",
-					name: "grammar_name"
-				},
-				{
-					kind: "reference",
-					name: "semicolon"
-				}
-			]
-		}
-	},
-	{
-		name: "grammar_name",
 		expression: {
 			kind: "choice",
 			alternatives: [
 				{
-					label: null,
+					label: "sections",
 					expression: {
-						kind: "reference",
-						name: "identifier"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "string_literal"
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "section"
+						}
 					}
 				}
 			]
 		}
 	},
 	{
-		name: "section",
+		name: "token_section",
 		expression: {
 			kind: "choice",
 			alternatives: [
 				{
-					label: null,
+					label: "definitions",
 					expression: {
-						kind: "reference",
-						name: "token_section"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "skip_section"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "states_section"
-					}
-				}
-			]
-		}
-	},
-	{
-		name: "token_section",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "tokens_kw"
-				},
-				{
-					kind: "reference",
-					name: "token_def"
-				},
-				{
-					kind: "repeat",
-					element: {
-						kind: "reference",
-						name: "token_def"
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "token_def"
+						}
 					}
 				}
 			]
@@ -13262,109 +13166,17 @@ var ast = [
 	{
 		name: "skip_section",
 		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "skip_kw"
-				},
-				{
-					kind: "reference",
-					name: "token_def"
-				},
-				{
-					kind: "repeat",
-					element: {
-						kind: "reference",
-						name: "token_def"
-					}
-				}
-			]
-		}
-	},
-	{
-		name: "states_section",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "states_kw"
-				},
-				{
-					kind: "reference",
-					name: "state_name"
-				},
+			kind: "choice",
+			alternatives: [
 				{
-					kind: "repeat",
-					element: {
-						kind: "sequence",
-						elements: [
-							{
-								kind: "reference",
-								name: "comma"
-							},
-							{
-								kind: "reference",
-								name: "state_name"
-							}
-						]
+					label: "definitions",
+					expression: {
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "token_def"
+						}
 					}
-				},
-				{
-					kind: "reference",
-					name: "semicolon"
-				}
-			]
-		}
-	},
-	{
-		name: "token_def",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "identifier"
-				},
-				{
-					kind: "reference",
-					name: "equal"
-				},
-				{
-					kind: "reference",
-					name: "regex_literal"
-				},
-				{
-					kind: "reference",
-					name: "semicolon"
-				}
-			]
-		}
-	},
-	{
-		name: "state_name",
-		expression: {
-			kind: "reference",
-			name: "identifier"
-		}
-	},
-	{
-		name: "start_decl",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "start_kw"
-				},
-				{
-					kind: "reference",
-					name: "identifier"
-				},
-				{
-					kind: "reference",
-					name: "semicolon"
 				}
 			]
 		}
@@ -13372,21 +13184,16 @@ var ast = [
 	{
 		name: "grammar_section",
 		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "grammar_kw"
-				},
-				{
-					kind: "reference",
-					name: "production"
-				},
+			kind: "choice",
+			alternatives: [
 				{
-					kind: "repeat",
-					element: {
-						kind: "reference",
-						name: "production"
+					label: "productions",
+					expression: {
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "production"
+						}
 					}
 				}
 			]
@@ -13395,21 +13202,16 @@ var ast = [
 	{
 		name: "ast_section",
 		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "ast_kw"
-				},
-				{
-					kind: "reference",
-					name: "ast_type"
-				},
+			kind: "choice",
+			alternatives: [
 				{
-					kind: "repeat",
-					element: {
-						kind: "reference",
-						name: "ast_type"
+					label: "types",
+					expression: {
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "ast_type"
+						}
 					}
 				}
 			]
@@ -13418,621 +13220,88 @@ var ast = [
 	{
 		name: "transform_section",
 		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "transform_kw"
-				},
-				{
-					kind: "reference",
-					name: "transform_rule"
-				},
+			kind: "choice",
+			alternatives: [
 				{
-					kind: "repeat",
-					element: {
-						kind: "reference",
-						name: "transform_rule"
+					label: "rules",
+					expression: {
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "transform_rule"
+						}
 					}
 				}
 			]
 		}
 	},
-	{
-		name: "production",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "identifier"
-				},
-				{
-					kind: "reference",
-					name: "equal"
-				},
-				{
-					kind: "reference",
-					name: "expression"
-				},
-				{
-					kind: "reference",
-					name: "semicolon"
-				}
-			]
-		}
-	},
-	{
-		name: "ast_type",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "identifier"
-				},
-				{
-					kind: "reference",
-					name: "equal"
-				},
-				{
-					kind: "reference",
-					name: "expression"
-				},
-				{
-					kind: "reference",
-					name: "semicolon"
-				}
-			]
-		}
-	},
 	{
 		name: "transform_rule",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "identifier"
-				},
-				{
-					kind: "reference",
-					name: "arrow"
-				},
-				{
-					kind: "reference",
-					name: "labeled_transform"
-				},
-				{
-					kind: "repeat",
-					element: {
-						kind: "sequence",
-						elements: [
-							{
-								kind: "reference",
-								name: "bar"
-							},
-							{
-								kind: "reference",
-								name: "labeled_transform"
-							}
-						]
-					}
-				},
-				{
-					kind: "reference",
-					name: "semicolon"
-				}
-			]
-		}
-	},
-	{
-		name: "labeled_transform",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "hash"
-				},
-				{
-					kind: "reference",
-					name: "identifier"
-				},
-				{
-					kind: "reference",
-					name: "transform_expr"
-				}
-			]
-		}
-	},
-	{
-		name: "transform_expr",
 		expression: {
 			kind: "choice",
 			alternatives: [
 				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "drop_kw"
-					}
-				},
-				{
-					label: null,
+					label: "alternatives",
 					expression: {
-						kind: "reference",
-						name: "pass_expr"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "fold_left_expr"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "fold_right_expr"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "flatten_expr"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "build_expr"
-					}
-				}
-			]
-		}
-	},
-	{
-		name: "pass_expr",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "pass_kw"
-				},
-				{
-					kind: "reference",
-					name: "lpar"
-				},
-				{
-					kind: "reference",
-					name: "reference"
-				},
-				{
-					kind: "reference",
-					name: "rpar"
-				}
-			]
-		}
-	},
-	{
-		name: "fold_left_expr",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "fold_left_kw"
-				},
-				{
-					kind: "reference",
-					name: "lpar"
-				},
-				{
-					kind: "reference",
-					name: "build_target"
-				},
-				{
-					kind: "reference",
-					name: "comma"
-				},
-				{
-					kind: "reference",
-					name: "reference_list"
-				},
-				{
-					kind: "reference",
-					name: "rpar"
-				}
-			]
-		}
-	},
-	{
-		name: "fold_right_expr",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "fold_right_kw"
-				},
-				{
-					kind: "reference",
-					name: "lpar"
-				},
-				{
-					kind: "reference",
-					name: "build_target"
-				},
-				{
-					kind: "reference",
-					name: "comma"
-				},
-				{
-					kind: "reference",
-					name: "reference_list"
-				},
-				{
-					kind: "reference",
-					name: "rpar"
-				}
-			]
-		}
-	},
-	{
-		name: "flatten_expr",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "flatten_kw"
-				},
-				{
-					kind: "reference",
-					name: "lpar"
-				},
-				{
-					kind: "reference",
-					name: "build_target"
-				},
-				{
-					kind: "reference",
-					name: "comma"
-				},
-				{
-					kind: "reference",
-					name: "reference"
-				},
-				{
-					kind: "reference",
-					name: "comma"
-				},
-				{
-					kind: "reference",
-					name: "reference"
-				},
-				{
-					kind: "reference",
-					name: "rpar"
-				}
-			]
-		}
-	},
-	{
-		name: "build_expr",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "build_target"
-				},
-				{
-					kind: "optional",
-					element: {
-						kind: "sequence",
-						elements: [
-							{
-								kind: "reference",
-								name: "lpar"
-							},
-							{
-								kind: "reference",
-								name: "reference_list"
-							},
-							{
-								kind: "reference",
-								name: "rpar"
-							}
-						]
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "labeled_transform"
+						}
 					}
 				}
 			]
 		}
 	},
-	{
-		name: "build_target",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "identifier"
-				},
-				{
-					kind: "reference",
-					name: "dot"
-				},
-				{
-					kind: "reference",
-					name: "hash"
-				},
-				{
-					kind: "reference",
-					name: "identifier"
-				}
-			]
-		}
-	},
 	{
 		name: "reference_list",
 		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "reference"
-				},
+			kind: "choice",
+			alternatives: [
 				{
-					kind: "repeat",
-					element: {
-						kind: "sequence",
-						elements: [
-							{
-								kind: "reference",
-								name: "comma"
-							},
-							{
-								kind: "reference",
-								name: "reference"
-							}
-						]
+					label: "references",
+					expression: {
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "reference"
+						}
 					}
 				}
 			]
 		}
 	},
-	{
-		name: "reference",
-		expression: {
-			kind: "reference",
-			name: "identifier"
-		}
-	},
-	{
-		name: "expression",
-		expression: {
-			kind: "reference",
-			name: "choice"
-		}
-	},
 	{
 		name: "choice",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "alternative"
-				},
-				{
-					kind: "repeat",
-					element: {
-						kind: "sequence",
-						elements: [
-							{
-								kind: "reference",
-								name: "bar"
-							},
-							{
-								kind: "reference",
-								name: "alternative"
-							}
-						]
-					}
-				}
-			]
-		}
-	},
-	{
-		name: "alternative",
-		expression: {
-			kind: "reference",
-			name: "labeled_alternative"
-		}
-	},
-	{
-		name: "labeled_alternative",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "optional",
-					element: {
-						kind: "sequence",
-						elements: [
-							{
-								kind: "reference",
-								name: "hash"
-							},
-							{
-								kind: "reference",
-								name: "identifier"
-							}
-						]
-					}
-				},
-				{
-					kind: "reference",
-					name: "sequence"
-				}
-			]
-		}
-	},
-	{
-		name: "sequence",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "factor"
-				},
-				{
-					kind: "repeat",
-					element: {
-						kind: "reference",
-						name: "factor"
-					}
-				}
-			]
-		}
-	},
-	{
-		name: "factor",
 		expression: {
 			kind: "choice",
 			alternatives: [
 				{
-					label: null,
+					label: "alternatives",
 					expression: {
-						kind: "reference",
-						name: "bracketed"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "repeat"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "group"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "primary"
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "alternative"
+						}
 					}
 				}
 			]
 		}
 	},
 	{
-		name: "bracketed",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "lbracket"
-				},
-				{
-					kind: "reference",
-					name: "expression"
-				},
-				{
-					kind: "reference",
-					name: "rbracket"
-				},
-				{
-					kind: "optional",
-					element: {
-						kind: "sequence",
-						elements: [
-							{
-								kind: "reference",
-								name: "colon"
-							},
-							{
-								kind: "reference",
-								name: "identifier"
-							}
-						]
-					}
-				}
-			]
-		}
-	},
-	{
-		name: "repeat",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "lbrace"
-				},
-				{
-					kind: "reference",
-					name: "expression"
-				},
-				{
-					kind: "reference",
-					name: "rbrace"
-				}
-			]
-		}
-	},
-	{
-		name: "group",
-		expression: {
-			kind: "sequence",
-			elements: [
-				{
-					kind: "reference",
-					name: "lpar"
-				},
-				{
-					kind: "reference",
-					name: "expression"
-				},
-				{
-					kind: "reference",
-					name: "rpar"
-				}
-			]
-		}
-	},
-	{
-		name: "primary",
+		name: "sequence",
 		expression: {
 			kind: "choice",
 			alternatives: [
 				{
-					label: null,
+					label: "factors",
 					expression: {
-						kind: "reference",
-						name: "string_literal"
-					}
-				},
-				{
-					label: null,
-					expression: {
-						kind: "reference",
-						name: "identifier"
+						kind: "repeat",
+						element: {
+							kind: "reference",
+							name: "factor"
+						}
 					}
 				}
 			]
@@ -14056,7 +13325,7 @@ var transform = [
 		]
 	},
 	{
-		production: "token_section$repeat_1",
+		production: "token_section",
 		alternatives: [
 			{
 				label: "main",
@@ -14071,7 +13340,7 @@ var transform = [
 		]
 	},
 	{
-		production: "skip_section$repeat_2",
+		production: "skip_section",
 		alternatives: [
 			{
 				label: "main",
@@ -14086,7 +13355,7 @@ var transform = [
 		]
 	},
 	{
-		production: "grammar_section$repeat_4",
+		production: "grammar_section",
 		alternatives: [
 			{
 				label: "main",
@@ -14101,7 +13370,7 @@ var transform = [
 		]
 	},
 	{
-		production: "ast_section$repeat_5",
+		production: "ast_section",
 		alternatives: [
 			{
 				label: "main",
@@ -14116,7 +13385,7 @@ var transform = [
 		]
 	},
 	{
-		production: "transform_section$repeat_6",
+		production: "transform_section",
 		alternatives: [
 			{
 				label: "main",
@@ -14131,7 +13400,7 @@ var transform = [
 		]
 	},
 	{
-		production: "transform_rule$repeat_7",
+		production: "transform_rule",
 		alternatives: [
 			{
 				label: "main",
@@ -14146,7 +13415,7 @@ var transform = [
 		]
 	},
 	{
-		production: "reference_list$repeat_8",
+		production: "reference_list",
 		alternatives: [
 			{
 				label: "main",
@@ -14161,7 +13430,7 @@ var transform = [
 		]
 	},
 	{
-		production: "choice$repeat_9",
+		production: "choice",
 		alternatives: [
 			{
 				label: "main",
@@ -14176,7 +13445,7 @@ var transform = [
 		]
 	},
 	{
-		production: "sequence$repeat_10",
+		production: "sequence",
 		alternatives: [
 			{
 				label: "main",
@@ -14331,13 +13600,31 @@ function reportDuplicateNames(names, section, kind, issues) {
  * @param issues - Issue list to append to.
  */
 function validateTransformProductionExists(rule, bnfProductionNames, issues) {
-    if (!bnfProductionNames.has(rule.production)) {
+    // Accept direct production names.
+    if (bnfProductionNames.has(rule.production)) {
+        return;
+    }
+    // Match authored `$repeat_0` aliases to globally numbered repeats.
+    const repeatPrefix = syntheticRepeatPrefix(rule.production);
+    const matchesRepeat = repeatPrefix !== null
+        && [...bnfProductionNames].some((productionName) => syntheticRepeatPrefix(productionName) === repeatPrefix);
+    if (!matchesRepeat) {
         issues.push({
             severity: 'error',
             message: `transform rule for unknown production ${JSON.stringify(rule.production)}`,
         });
     }
 }
+/**
+ * Returns the stable prefix of a numbered synthetic repeat production.
+ *
+ * @param name - Production or transform-rule name.
+ * @returns Prefix ending in `$repeat`, or null for a regular production.
+ */
+function syntheticRepeatPrefix(name) {
+    const match = /^(.+\$repeat)_\d+$/.exec(name);
+    return match?.[1] ?? null;
+}
 /**
  * Validates one transform expression against the grammar AST schema.
  *