[ext/JSON] sync from upstream

tadzik · Aug 24, 2012 · 8459527 · 8459527
1 parent 506a8f7
commit 8459527
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ext/JSON__Tiny/lib/JSON/Tiny.pm b/ext/JSON__Tiny/lib/JSON/Tiny.pm
@@ -29,7 +29,7 @@ multi to-json(Str:D  $d) {
             .subst(/<-[\c32..\c126]>/, { ord(~$_).fmt('\u%04x') }, :g)
     ~ '"'
 }
-multi to-json(Array:D $d) {
+multi to-json(Positional:D $d) {
     return  '[ '
             ~ $d.map(&to-json).join(', ')
             ~ ' ]';

diff --git a/ext/JSON__Tiny/lib/JSON/Tiny/Grammar.pm b/ext/JSON__Tiny/lib/JSON/Tiny/Grammar.pm
@@ -1,12 +1,12 @@
 use v6;
 grammar JSON::Tiny::Grammar;
 
-rule TOP        { ^[ <object> | <array> ]$ }
+rule TOP        { ^ [ <object> | <array> ] $ }
 rule object     { '{' ~ '}' <pairlist>     }
-rule pairlist   { <pair>* % \,             }
-rule pair       { <string> ':' <value>     }
+rule pairlist   { <?> <pair> * % \,             }
+rule pair       { <?> <string> ':' <value>     }
 rule array      { '[' ~ ']' <arraylist>    }
-rule arraylist  { <value>* % [ \, ]        }
+rule arraylist  { <?> <value>* % [ \, ]        }
 
 proto token value {*};
 token value:sym<number> {