Move BNF BNF to grammars

Added `-` support in BNF identifiers
Fix bnf script pattern output

Author: james-pre

src/bnf.bnf renamed to grammars/bnf.bnf

@@ -1,6 +1,6 @@
 
 string          = '("(?:\\.|[^"\\])*"|\'(?:\\.|[^\'\\])*\')';
-identifier      = '[a-zA-Z_]\w*';
+identifier      = '[a-zA-Z_][\w-]*';
 whitespace      = '[ \t]+';
 line_terminator	= "\n+";
 comment         = "#(?!#)([^\n]*)";
@@ -30,6 +30,8 @@ term = parenthesized | optional | repetition | string | identifier;
 sequence = term*;
 expression = sequence {pipe sequence};
 
-rule = identifier '=' expression ';';
+attribute = '@' identifier;
+
+rule = attribute* identifier '=' expression ';';
 
 ##root rule directive

scripts/bnf.js

@@ -126,7 +126,7 @@ switch (options.format) {
 				literals: config.literals.map(literal => {
 					const base = {
 						name: literal.name,
-						pattern: literal.pattern.source,
+						pattern: literal.pattern.source.slice(1),
 					};
 
 					const { flags } = literal.pattern;

src/bnf.json

@@ -87,10 +87,19 @@
 				{ "kind": "expression#0", "type": "repeated" }
 			]
 		},
+		{
+			"name": "attribute",
+			"type": "sequence",
+			"pattern": [
+				{ "kind": "@", "type": "required" },
+				{ "kind": "identifier", "type": "required" }
+			]
+		},
 		{
 			"name": "rule",
 			"type": "sequence",
 			"pattern": [
+				{ "kind": "attribute", "type": "repeated" },
 				{ "kind": "identifier", "type": "required" },
 				{ "kind": "=", "type": "required" },
 				{ "kind": "expression", "type": "required" },
@@ -100,7 +109,7 @@
 	],
 	"literals": [
 		{ "name": "string", "pattern": "(\"(?:\\\\.|[^\"\\\\])*\"|'(?:\\\\.|[^'\\\\])*')" },
-		{ "name": "identifier", "pattern": "[a-zA-Z_]\\w*" },
+		{ "name": "identifier", "pattern": "[a-zA-Z_][\\w-]*" },
 		{ "name": "whitespace", "pattern": "[ \\t]+" },
 		{ "name": "line_terminator", "pattern": "\\n+" },
 		{ "name": "comment", "pattern": "#(?!#)([^\\n]*)" },
@@ -115,6 +124,7 @@
 		{ "name": "right_brace", "pattern": "\\}" },
 		{ "name": "\\?", "pattern": "\\?" },
 		{ "name": "\\*", "pattern": "\\*" },
+		{ "name": "@", "pattern": "@" },
 		{ "name": "=", "pattern": "=" },
 		{ "name": ";", "pattern": ";" }
 	],