feature(grammar): allow key-value options

zaach · Jun 7, 2015 · efec681 · efec681
1 parent d212acc
commit efec681
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/bnf.l b/bnf.l
@@ -24,6 +24,7 @@ id                [a-zA-Z][a-zA-Z0-9_-]*
 ":"                     return ':';
 ";"                     return ';';
 "|"                     return '|';
+"="                     return '=';
 "%%"                    this.pushState(ebnf ? 'ebnf' : 'bnf'); return '%%';
 "%ebnf"                 if (!yy.options) yy.options = {}; ebnf = yy.options.ebnf = true;
 "%prec"                 return 'PREC';

diff --git a/bnf.y b/bnf.y
@@ -51,10 +51,24 @@ declaration
     ;
 
 options
-    : OPTIONS token_list
+    : OPTIONS options_list
         {$$ = $2;}
     ;
 
+options_list
+    : options_list option
+        { $$ = $1; $$[$2[0]] = $2[1]; }
+    | option
+        {$$ = {}; $$[$1[0]] = $1[1];}
+    ;
+
+option
+    : symbol
+        {$$ = [$1, true];}
+    | symbol '=' symbol
+        {$$ = [$1, $3];}
+    ;
+
 parse_param
     : PARSE_PARAM token_list
         {$$ = $2;}

diff --git a/ebnf-parser.js b/ebnf-parser.js
@@ -27,9 +27,9 @@ bnf.yy.addDeclaration = function (grammar, decl) {
 
     } else if (decl.options) {
         if (!grammar.options) grammar.options = {};
-        for (var i=0; i < decl.options.length; i++) {
-            grammar.options[decl.options[i]] = true;
-        }
+        Object.keys(decl.options).forEach(function(option) {
+            grammar.options[option] = decl.options[option];
+        });
     }
 
 };

diff --git a/tests/bnf_parse.js b/tests/bnf_parse.js
@@ -219,3 +219,10 @@ exports["test options"] = function () {
 
     assert.deepEqual(bnf.parse(grammar), expected, "grammar should be parsed correctly");
 };
+
+exports["test key-value options"] = function () {
+    var grammar = "%options foo=bar baz\n%%hello: world;%%";
+    var expected = {bnf: {hello: ["world"]}, options: {foo: 'bar', baz: true}};
+
+    assert.deepEqual(bnf.parse(grammar), expected, "grammar should be parsed correctly");
+};