json: extension: allow circle notation.

* parser.l (HASH_N_EQUALS, HASH_N_HASH): Recognize these
tokens in the JSON start state also.

* parser.y (json_val): Add the circular syntax, exactly like
it is done for n_expr and i_expr. And it works!

* lex.yy.c.shipped, y.tab.c.shipped, y.tab.h.shipped: Updated.

1 files changed, 4 insertions, 0 deletions

diff --git a/parser.y b/parser.y
index 68bb1c7d..7725111a 100644
--- a/parser.y
+++ b/parser.y
@@ -950,6 +950,10 @@ json_val : NUMBER               { $$ = $1; }
          | '[' json_vals ']'    { $$ = $2; }
          | '{' '}'              { $$ = make_hash(nil, nil, t); }
          | '{' json_pairs '}'   { $$ = $2; }
+         | HASH_N_EQUALS        { parser_circ_def(parser, $1, unique_s); }
+           json_val             { parser_circ_def(parser, $1, $3);
+                                  $$ = $3; }
+         | HASH_N_HASH          { $$ = parser_circ_ref(parser, $1); }
          | '"' error            { $$ = nil;
                                   yybadtok(yychar, lit("JSON string")); }
          | '[' error            { $$ = nil;