From c12f969791bec0b2d6e985193c67b1f79db99ccc Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 3 Jun 2021 07:32:42 -0700 Subject: json: pattern matching test cases and bugfix. * parser.y (json_val): We must nreverse the json_pairs which were pushed in right to left order. This didn't matter for constructing hashes so it was left out, but under quasiquoting the order matters: it determines the order of evaluation and of pattern matching. * tests/011/patmatch.tl: New quasiquoting pattern matching cases, including JSON. * y.tab.c.shipped: Regenerated. --- tests/011/patmatch.tl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'tests/011') diff --git a/tests/011/patmatch.tl b/tests/011/patmatch.tl index 071243fb..8a304a6d 100644 --- a/tests/011/patmatch.tl +++ b/tests/011/patmatch.tl @@ -472,6 +472,23 @@ (list x y)) ((1 2) (1 4) (3 2) (3 4) (5 2) (5 4))) +(mtest + (when-match ^(,a ,b) '(1 2) (list a b)) (1 2) + (when-match ^#(,a ,b) #(1 2) (list a b)) (1 2) + (when-match ^#S(,type year ,y) #S(time year 2021) + (list (struct-type-name type) y)) (time 2021) + (when-match ^#H(() (x ,y) (,(symbolp @y) ,datum)) + #H(() (x k) (k 42)) + datum) (42)) + +(mtest + (when-match ^#J~a 42.0 a) 42.0 + (when-match ^#J[~a, ~b] #J[true, false] (list a b)) (t nil) + (when-match ^#J{"x" : ~y, ~(symbolp @y) : ~datum} + #J{"x" : true, true : 42} + datum) (42.0) + (when-match ^#J{"foo" : {"x" : ~val}} #J{"foo" : {"x" : "y"}} val) "y") + (compile-only (eval-only (compile-file (base-name *load-path*) "temp.tlo") -- cgit v1.2.3