From ed7185e3fd6307d9c4bc97be606a08bd9ed3502f Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 19 Jul 2021 07:26:56 -0700 Subject: op: set nested flag in correct context. * stdlib/op.tl (sys:op-meta-p): Return an extended Boolean value: a true result is an integer indicating the depth of the variable. For instance @1 is depth 0, @@1 is depth 1 and so on. (sys:find-parent): New function. (sys:op-alpha-rename): When processing a nested meta, do not set the nested flag in the immediate parent. Use find-parent to go up to the correct level to which the meta belongs and set the flag there. * tests/012/op.tl: New test cases which depend on this. --- tests/012/op.tl | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests') diff --git a/tests/012/op.tl b/tests/012/op.tl index 0cdc3e7b..5a789219 100644 --- a/tests/012/op.tl +++ b/tests/012/op.tl @@ -82,3 +82,14 @@ [[(do op list @1)] 2] :error [[(do op list @1) 1] 2] (2 1) [[(do op list @@1 @1) 1] 2] (1 2)) + +(mtest + [[[[(do do do op list @1) 1] 2] 3] 4] (4 1 2 3) + [[[[(do do do op list @@1) 1] 2] 3] 4] (3 1 2 4) + [[[[(do do do op list @@@1) 1] 2] 3] 4] (2 1 3 4) + [[[[(do do do op list @@@@1) 1] 2] 3] 4] (1 2 3 4)) + +(mtest + [[[[(do do do op list) 1] 2] 3] 4] (1 2 3 4) + [[[[(do do do op list @1 @@1 @@@1 @@@@1) 1] 2] 3] 4] (4 3 2 1) + [[[[(do do do op list @@@@1 @@@1 @@1 @1) 1] 2] 3] 4] (1 2 3 4)) -- cgit v1.2.3