Improve ##groups

Author: james-pre

grammars/c23/preprocessing.bnf

@@ -15,14 +15,14 @@ if_group = "#" (
 | ("ifdef\b" identifier group_part*)
 | ("ifndef\b" identifier group_part*)
 );
-##groups if_group if ifdef ifndef
+##groups if_group %#if %#ifdef %#ifndef
 
 elif_group = "#" (
 | ("elif\b" constant_expression group_part*)
 | ("elifdef\b" identifier group_part*)
 | ("elifndef\b" identifier group_part*)
 );
-##groups elif_group elif elifdef elifndef
+##groups elif_group %#elif %#elifdef %#elifndef
 
 else_group = "#" "else\b" group_part*;
 

scripts/bnf.js

@@ -18,6 +18,7 @@ const {
 		parser: { short: 'P', type: 'string' },
 		verbose: { short: 'V', type: 'boolean', multiple: true },
 		help: { short: 'h', type: 'boolean', default: false },
+		compress: { type: 'boolean', default: false },
 	},
 	allowPositionals: true,
 });
@@ -29,6 +30,7 @@ Output options:
     --output,-o <path>       Path to an output file
     --colors,-c              Colorize output messages
     --help,-h                Display this help message  
+    --compress               Compress the output config
 Debugging options:
     --tokens,-T [only]       Show tokenizer output. If 'only', only the tokenizer output will be shown.
     --parser,-P [only]       Show parser output. If 'only', only the parser output will be shown.
@@ -112,7 +114,9 @@ function include(path) {
 	}
 }
 
-const config = compressConfig(bnf.ast_to_config(ast, logger(verbose), include));
+let config = bnf.ast_to_config(ast, logger(verbose), include);
+
+if (options.compress) config = compressConfig(config);
 
 const write = data => (options.output ? writeFileSync(options.output, data) : console.log);
 

src/bnf.ts

@@ -81,7 +81,7 @@ export function ast_to_config(ast: Node[], log: Logger = () => {}, include?: (na
 				}
 				// ##groups <rule> <name 0> <name 1> ... <name n>
 				case 'groups': {
-					const [, name, _names] = contents.match(/(\w+)\s+([\s\w]+)/) || [];
+					const [, name, _names] = contents.match(/(\w+)\s+(.+)/) || [];
 					const groupNames = _names.split(/[\s,]+/);
 					const rule = definitions.find(d => d.name == name);
 					if (!rule) {
@@ -96,14 +96,16 @@ export function ast_to_config(ast: Node[], log: Logger = () => {}, include?: (na
 							break;
 						}
 
-						for (const part of rule.pattern) {
+						const new_name = groupNames[i].replaceAll('%', name);
+
+						for (const part of definitions.flatMap(d => d.pattern)) {
 							if (part.kind == group.name) {
-								part.kind = groupNames[i];
+								part.kind = new_name;
 							}
 						}
 
-						_log(1, `Renaming group: ${group.name} -> ${groupNames[i]}`);
-						group.name = groupNames[i];
+						_log(1, `Renaming group: ${group.name} -> ${new_name}`);
+						group.name = new_name;
 					}
 					break;
 				}