fix(grammar): scards has a space between each card

richardschneider · Sep 16, 2016 · b4ed913 · b4ed913
1 parent 99fb02e
commit b4ed913
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/grammar.js b/lib/grammar.js
@@ -41,6 +41,7 @@ function ast(kind) {
 /* Tokens */
 g.addRule('port', p.number());
 g.addRule('protocolVersion', p.number());
+setExample('protocolVersion', '18');
 g.addRule('teamName', p.string());
 
 /* Expressions */
@@ -80,7 +81,12 @@ g.addRule('card', p.regex(/^[AKQJT98765432][SHDC]/, 'KH'));
 
 g.addRule('scards', p.either(
     p.keyword('-', true),
-    p.regex(/^[AKQJT98765432]+/, 'AJ43')
+    p
+        .regex(/^[AKQJT98765432 ]+/, 'A J 4 3')
+        .op((stack, cb) => {
+            stack.push(stack.pop().replace(/ /g,''));
+            cb();
+        })
 ));
 g.addRule('hand',
     p.kleene(
@@ -99,7 +105,7 @@ g.addRule('hand',
         cb();
     })
 );
-setExample('hand', 'S AKJ43. H -. D 6543. C QJT9.');
+setExample('hand', 'S A K J 4 3. H -. D 6 5 4 3. C Q J T 9.');
 
 g.addRule('someCards',
     p.sequence(

diff --git a/test/parser.js b/test/parser.js
@@ -46,7 +46,7 @@ describe('Parser', () => {
         });
 
         it('should have specific properties of the cards message', done => {
-            let msg = "north's cards : S AKJ43. H -. D 6543. C QJT9.";
+            let msg = "north's cards : S A K J 4 3. H -. D 6 5 4 3. C Q J T 9.";
             tm.parse(msg, (err, ast) => {
                 if(err) {
                     done(err);