From 30479dde9f2b794bb6c16447e76087675d45d3cf Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+symantic-parser@sourcephile.fr>
Date: Sun, 31 Jan 2021 19:24:46 +0100
Subject: [PATCH] test: sync
---
test/Golden/Machine/brainfuck.dump | 26 +--
test/Golden/Machine/nandlang.dump | 314 +++++++++++++--------------
test/Golden/Machine/some-string.dump | 12 +-
3 files changed, 176 insertions(+), 176 deletions(-)
diff --git a/test/Golden/Machine/brainfuck.dump b/test/Golden/Machine/brainfuck.dump
index 583132d..2eafd68 100644
--- a/test/Golden/Machine/brainfuck.dump
+++ b/test/Golden/Machine/brainfuck.dump
@@ -1,13 +1,13 @@
push (\u1 -> (\u2 -> u2))
-name_1:
+name_2:
| push (\u1 -> Term)
-| name_4:
+| name_1:
| | catchFail
| | <try>
| | | push (\u1 -> (\u2 -> (\u3 -> u2 u3)))
| | | read Term
| | | lift (\u1 -> (\u2 -> u1 u2))
-| | | call name_4
+| | | call name_1
| | | lift (\u1 -> (\u2 -> u1 u2))
| | | popFail
| | | ret
@@ -20,23 +20,23 @@ name_1:
| | | ret
| | <default>
| | fail
-| call name_4
+| call name_1
| lift (\u1 -> (\u2 -> u1 u2))
| ret
-call name_1
+call name_2
lift (\u1 -> (\u2 -> u1 u2))
-name_3:
+name_4:
| push (\u1 -> u1 Term)
-| name_2:
+| name_3:
| | catchFail
| | <try>
| | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (u1 u2) (u3 u4)))))
| | | join_46:
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | call name_1
-| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | call name_2
| | | | lift (\u1 -> (\u2 -> u1 u2))
+| | | | call name_3
+| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | popFail
| | | | ret
| | | pushInput
@@ -78,9 +78,9 @@ name_3:
| | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> cons (Term u3))))))
| | | | read ((\u1 -> (\u2 -> u1)) Term)
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | call name_1
+| | | | call name_2
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | call name_3
+| | | | call name_4
| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | read (']' ==)
| | | | lift (\u1 -> (\u2 -> u1 u2))
@@ -96,9 +96,9 @@ name_3:
| | | ret
| | <default>
| | fail
-| call name_2
+| call name_3
| lift (\u1 -> (\u2 -> u1 u2))
| ret
-call name_3
+call name_4
lift (\u1 -> (\u2 -> u1 u2))
ret
diff --git a/test/Golden/Machine/nandlang.dump b/test/Golden/Machine/nandlang.dump
index a0de89a..ecb418f 100644
--- a/test/Golden/Machine/nandlang.dump
+++ b/test/Golden/Machine/nandlang.dump
@@ -1,41 +1,41 @@
push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> u4)))))
-name_26:
+name_29:
| push (\u1 -> (\u2 -> (\u3 -> u3)))
-| name_10:
+| name_13:
| | push Term
| | ret
-| call name_10
+| call name_13
| lift (\u1 -> (\u2 -> u1 u2))
-| name_9:
+| name_12:
| | catchFail
| | <try>
| | | push (\u1 -> (\u2 -> (\u3 -> u2 u3)))
| | | join_46:
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | call name_9
+| | | | call name_12
| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | popFail
| | | | ret
| | | catchFail
| | | <try>
| | | | push (\u1 -> (\u2 -> Term))
-| | | | name_11:
+| | | | name_14:
| | | | | push (\u1 -> (\u2 -> u2))
| | | | | read Term
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_10
+| | | | | call name_13
| | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | ret
-| | | | call name_11
+| | | | call name_14
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | name_14:
+| | | | name_17:
| | | | | catchFail
| | | | | <try>
| | | | | | push (\u1 -> (\u2 -> (\u3 -> u2 u3)))
-| | | | | | call name_11
-| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | call name_14
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
+| | | | | | call name_17
+| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | popFail
| | | | | | ret
| | | | | <handler>
@@ -47,7 +47,7 @@ name_26:
| | | | | | ret
| | | | | <default>
| | | | | fail
-| | | | call name_14
+| | | | call name_17
| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | popFail
| | | | refJoin join_46
@@ -66,15 +66,15 @@ name_26:
| | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | popFail
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_10
+| | | | | call name_13
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | name_19:
+| | | | | name_22:
| | | | | | catchFail
| | | | | | <try>
| | | | | | | push (\u1 -> (\u2 -> (\u3 -> u2 u3)))
| | | | | | | read Term
| | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | call name_19
+| | | | | | | call name_22
| | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | popFail
| | | | | | | ret
@@ -87,11 +87,11 @@ name_26:
| | | | | | | ret
| | | | | | <default>
| | | | | | fail
-| | | | | call name_19
+| | | | | call name_22
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_10
+| | | | | call name_13
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_10
+| | | | | call name_13
| | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | refJoin join_46
| | | | <handler>
@@ -108,16 +108,16 @@ name_26:
| | | ret
| | <default>
| | fail
-| call name_9
+| call name_12
| lift (\u1 -> (\u2 -> u1 u2))
-| call name_10
+| call name_13
| lift (\u1 -> (\u2 -> u1 u2))
| ret
-call name_26
+call name_29
lift (\u1 -> (\u2 -> u1 u2))
-call name_10
+call name_13
lift (\u1 -> (\u2 -> u1 u2))
-name_12:
+name_15:
| catchFail
| <try>
| | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (\u6 -> (\u7 -> (\u8 -> (\u9 -> (\u10 -> u9 u10))))))))))
@@ -143,14 +143,14 @@ name_12:
| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | read ('n' ==)
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | name_4:
+| | | | name_7:
| | | | | push Term
| | | | | ret
-| | | | call name_4
+| | | | call name_7
| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | popFail
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | name_2:
+| | | | name_5:
| | | | | catchFail
| | | | | <try>
| | | | | | pushInput
@@ -163,28 +163,28 @@ name_12:
| | | | | loadInput
| | | | | push Term
| | | | | ret
-| | | | call name_2
+| | | | call name_5
| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | popFail
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | call name_26
+| | | | call name_29
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | name_28:
+| | | | name_2:
| | | | | push (\u1 -> (\u2 -> u2))
| | | | | catchFail
| | | | | <try>
| | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> u4))))
| | | | | | read Term
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_10
+| | | | | | call name_13
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | name_24:
+| | | | | | name_27:
| | | | | | | catchFail
| | | | | | | <try>
| | | | | | | | push (\u1 -> (\u2 -> (\u3 -> u2 u3)))
| | | | | | | | read Term
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | call name_24
+| | | | | | | | call name_27
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | popFail
| | | | | | | | ret
@@ -197,36 +197,36 @@ name_12:
| | | | | | | | ret
| | | | | | | <default>
| | | | | | | fail
-| | | | | | call name_24
+| | | | | | call name_27
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_10
+| | | | | | call name_13
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | popFail
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_26
+| | | | | | call name_29
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | ret
| | | | | <handler>
| | | | | loadInput
| | | | | fail
-| | | | call name_28
+| | | | call name_2
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | name_22:
+| | | | name_25:
| | | | | push (\u1 -> (\u2 -> '('))
| | | | | read ('(' ==)
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_26
+| | | | | call name_29
| | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | ret
-| | | | call name_22
+| | | | call name_25
| | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | name_25:
+| | | | name_28:
| | | | | catchFail
| | | | | <try>
| | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> Term))))
-| | | | | | name_3:
+| | | | | | name_6:
| | | | | | | push (\u1 -> (\u2 -> u2))
-| | | | | | | call name_28
+| | | | | | | call name_2
| | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | join_46:
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
@@ -234,24 +234,24 @@ name_12:
| | | | | | | catchFail
| | | | | | | <try>
| | | | | | | | push (\u1 -> Term)
-| | | | | | | | name_18:
+| | | | | | | | name_21:
| | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (\u6 -> Term))))))
| | | | | | | | | read ('[' ==)
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | call name_26
+| | | | | | | | | call name_29
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | name_7:
+| | | | | | | | | name_10:
| | | | | | | | | | read Term
| | | | | | | | | | ret
-| | | | | | | | | call name_7
+| | | | | | | | | call name_10
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | name_21:
+| | | | | | | | | name_24:
| | | | | | | | | | catchFail
| | | | | | | | | | <try>
| | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> u2 u3)))
-| | | | | | | | | | | call name_7
+| | | | | | | | | | | call name_10
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | call name_21
+| | | | | | | | | | | call name_24
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | popFail
| | | | | | | | | | | ret
@@ -264,14 +264,14 @@ name_12:
| | | | | | | | | | | ret
| | | | | | | | | | <default>
| | | | | | | | | | fail
-| | | | | | | | | call name_21
+| | | | | | | | | call name_24
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | read (']' ==)
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | call name_26
+| | | | | | | | | call name_29
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | ret
-| | | | | | | | call name_18
+| | | | | | | | call name_21
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | popFail
| | | | | | | | refJoin join_46
@@ -280,35 +280,35 @@ name_12:
| | | | | | | lift Term
| | | | | | | choices [(\u1 -> u1)]
| | | | | | | <branch>
-| | | | | | | | call name_10
+| | | | | | | | call name_13
| | | | | | | | refJoin join_46
| | | | | | | <default>
| | | | | | | fail
-| | | | | | call name_3
+| | | | | | call name_6
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_10
+| | | | | | call name_13
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | name_30:
+| | | | | | name_1:
| | | | | | | catchFail
| | | | | | | <try>
| | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (u1 u3) (u4 u5))))))
-| | | | | | | | name_23:
+| | | | | | | | name_26:
| | | | | | | | | push (\u1 -> (\u2 -> u2))
| | | | | | | | | ret
-| | | | | | | | call name_23
+| | | | | | | | call name_26
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | name_5:
+| | | | | | | | name_8:
| | | | | | | | | push (\u1 -> (\u2 -> ','))
| | | | | | | | | read (',' ==)
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | call name_26
+| | | | | | | | | call name_29
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | ret
-| | | | | | | | call name_5
+| | | | | | | | call name_8
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | call name_3
+| | | | | | | | call name_6
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | call name_30
+| | | | | | | | call name_1
| | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | popFail
| | | | | | | | ret
@@ -321,9 +321,9 @@ name_12:
| | | | | | | | ret
| | | | | | | <default>
| | | | | | | fail
-| | | | | | call name_30
+| | | | | | call name_1
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_10
+| | | | | | call name_13
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | popFail
| | | | | | ret
@@ -332,37 +332,37 @@ name_12:
| | | | | lift Term
| | | | | choices [(\u1 -> u1)]
| | | | | <branch>
-| | | | | | jump name_10
+| | | | | | jump name_13
| | | | | <default>
| | | | | fail
-| | | | call name_25
+| | | | call name_28
| | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | join_46:
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | name_16:
+| | | | | name_19:
| | | | | | push (\u1 -> (\u2 -> ')'))
| | | | | | read (')' ==)
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_26
+| | | | | | call name_29
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | ret
-| | | | | call name_16
+| | | | | call name_19
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | name_29:
+| | | | | name_3:
| | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (\u6 -> (\u7 -> u5)))))))
| | | | | | read ('{' ==)
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_26
+| | | | | | call name_29
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_10
+| | | | | | call name_13
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | name_15:
+| | | | | | name_18:
| | | | | | | catchFail
| | | | | | | <try>
| | | | | | | | push (\u1 -> (\u2 -> (\u3 -> u2 u3)))
| | | | | | | | join_46:
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | call name_15
+| | | | | | | | | call name_18
| | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | popFail
| | | | | | | | | ret
@@ -379,25 +379,25 @@ name_12:
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | read ('f' ==)
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | call name_4
+| | | | | | | | | | | call name_7
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | popFail
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | call name_2
+| | | | | | | | | | | call name_5
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | popFail
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | call name_26
+| | | | | | | | | | | call name_29
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | name_1:
+| | | | | | | | | | | name_4:
| | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> u4))))
-| | | | | | | | | | | | name_27:
+| | | | | | | | | | | | name_30:
| | | | | | | | | | | | | catchFail
| | | | | | | | | | | | | <try>
| | | | | | | | | | | | | | push (\u1 -> (\u2 -> u2))
| | | | | | | | | | | | | | join_46:
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_26
+| | | | | | | | | | | | | | | call name_29
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | ret
@@ -433,7 +433,7 @@ name_12:
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | read ('\'' ==)
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | call name_26
+| | | | | | | | | | | | | | | | call name_29
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | | ret
@@ -442,7 +442,7 @@ name_12:
| | | | | | | | | | | | | | | | push (\u1 -> (\u2 -> u2))
| | | | | | | | | | | | | | | | read Term
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | | refJoin join_46
@@ -456,7 +456,7 @@ name_12:
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | read Term
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | | | | | <default>
@@ -467,7 +467,7 @@ name_12:
| | | | | | | | | | | | | | choices [(\u1 -> u1)]
| | | | | | | | | | | | | | <branch>
| | | | | | | | | | | | | | | push (\u1 -> (\u2 -> u2))
-| | | | | | | | | | | | | | | call name_28
+| | | | | | | | | | | | | | | call name_2
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | join_46:
| | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
@@ -482,32 +482,32 @@ name_12:
| | | | | | | | | | | | | | | | catchFail
| | | | | | | | | | | | | | | | <try>
| | | | | | | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> u2)))
-| | | | | | | | | | | | | | | | | call name_22
+| | | | | | | | | | | | | | | | | call name_25
| | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | | join_46:
| | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | | | call name_16
+| | | | | | | | | | | | | | | | | | call name_19
| | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | | | | | | | catchFail
| | | | | | | | | | | | | | | | | <try>
| | | | | | | | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> Term))))
-| | | | | | | | | | | | | | | | | | call name_1
+| | | | | | | | | | | | | | | | | | call name_4
| | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | | | name_20:
+| | | | | | | | | | | | | | | | | | name_23:
| | | | | | | | | | | | | | | | | | | catchFail
| | | | | | | | | | | | | | | | | | | <try>
| | | | | | | | | | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (u1 u3) (u4 u5))))))
-| | | | | | | | | | | | | | | | | | | | call name_23
+| | | | | | | | | | | | | | | | | | | | call name_26
| | | | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | | | | | call name_5
+| | | | | | | | | | | | | | | | | | | | call name_8
| | | | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | | | | | call name_1
+| | | | | | | | | | | | | | | | | | | | call name_4
| | | | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | | | | | call name_20
+| | | | | | | | | | | | | | | | | | | | call name_23
| | | | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | | | | | | ret
@@ -520,9 +520,9 @@ name_12:
| | | | | | | | | | | | | | | | | | | | ret
| | | | | | | | | | | | | | | | | | | <default>
| | | | | | | | | | | | | | | | | | | fail
-| | | | | | | | | | | | | | | | | | call name_20
+| | | | | | | | | | | | | | | | | | call name_23
| | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | | | | refJoin join_46
@@ -531,7 +531,7 @@ name_12:
| | | | | | | | | | | | | | | | | lift Term
| | | | | | | | | | | | | | | | | choices [(\u1 -> u1)]
| | | | | | | | | | | | | | | | | <branch>
-| | | | | | | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | | | | | | | <default>
| | | | | | | | | | | | | | | | | fail
@@ -540,7 +540,7 @@ name_12:
| | | | | | | | | | | | | | | | lift Term
| | | | | | | | | | | | | | | | choices [(\u1 -> u1)]
| | | | | | | | | | | | | | | | <branch>
-| | | | | | | | | | | | | | | | | call name_18
+| | | | | | | | | | | | | | | | | call name_21
| | | | | | | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | | | | | | <default>
| | | | | | | | | | | | | | | | fail
@@ -549,7 +549,7 @@ name_12:
| | | | | | | | | | | | | | | lift Term
| | | | | | | | | | | | | | | choices [(\u1 -> u1)]
| | | | | | | | | | | | | | | <branch>
-| | | | | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | | | | | <default>
| | | | | | | | | | | | | | | fail
@@ -557,21 +557,21 @@ name_12:
| | | | | | | | | | | | | | fail
| | | | | | | | | | | | | <default>
| | | | | | | | | | | | | fail
-| | | | | | | | | | | | call name_27
+| | | | | | | | | | | | call name_30
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | call name_10
+| | | | | | | | | | | | call name_13
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | name_13:
+| | | | | | | | | | | | name_16:
| | | | | | | | | | | | | catchFail
| | | | | | | | | | | | | <try>
| | | | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> u4 u5)))))
| | | | | | | | | | | | | | read ('!' ==)
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | call name_26
+| | | | | | | | | | | | | | call name_29
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | call name_27
+| | | | | | | | | | | | | | call name_30
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | call name_13
+| | | | | | | | | | | | | | call name_16
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | ret
@@ -584,14 +584,14 @@ name_12:
| | | | | | | | | | | | | | ret
| | | | | | | | | | | | | <default>
| | | | | | | | | | | | | fail
-| | | | | | | | | | | | call name_13
+| | | | | | | | | | | | call name_16
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | call name_10
+| | | | | | | | | | | | call name_13
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | ret
-| | | | | | | | | | | call name_1
+| | | | | | | | | | | call name_4
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | call name_29
+| | | | | | | | | | | call name_3
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | join_46:
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
@@ -614,18 +614,18 @@ name_12:
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | read ('e' ==)
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | call name_4
+| | | | | | | | | | | | | | call name_7
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | call name_2
+| | | | | | | | | | | | | | call name_5
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | call name_26
-| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | call name_29
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
+| | | | | | | | | | | | | | call name_3
+| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | | | <handler>
@@ -639,7 +639,7 @@ name_12:
| | | | | | | | | | | lift Term
| | | | | | | | | | | choices [(\u1 -> u1)]
| | | | | | | | | | | <branch>
-| | | | | | | | | | | | call name_10
+| | | | | | | | | | | | call name_13
| | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | <default>
| | | | | | | | | | | fail
@@ -673,19 +673,19 @@ name_12:
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | read ('e' ==)
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | call name_4
+| | | | | | | | | | | | call name_7
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | popFail
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | call name_2
+| | | | | | | | | | | | call name_5
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | popFail
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | call name_26
+| | | | | | | | | | | | call name_29
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | call name_1
+| | | | | | | | | | | | call name_4
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | call name_29
+| | | | | | | | | | | | call name_3
| | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | popFail
| | | | | | | | | | | | refJoin join_46
@@ -707,21 +707,21 @@ name_12:
| | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (\u6 -> (\u7 -> (\u8 -> (\u9 -> (\u10 -> (\u11 -> (\u12 -> u11))))))))))))
| | | | | | | | | | | | join_46:
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | call name_3
+| | | | | | | | | | | | | call name_6
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | name_8:
+| | | | | | | | | | | | | name_11:
| | | | | | | | | | | | | | catchFail
| | | | | | | | | | | | | | <try>
| | | | | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (u1 u3) (u4 u5))))))
-| | | | | | | | | | | | | | | call name_23
+| | | | | | | | | | | | | | | call name_26
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_5
+| | | | | | | | | | | | | | | call name_8
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_3
+| | | | | | | | | | | | | | | call name_6
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_8
+| | | | | | | | | | | | | | | call name_11
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | ret
@@ -734,29 +734,29 @@ name_12:
| | | | | | | | | | | | | | | ret
| | | | | | | | | | | | | | <default>
| | | | | | | | | | | | | | fail
-| | | | | | | | | | | | | call name_8
+| | | | | | | | | | | | | call name_11
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | read ('=' ==)
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | call name_26
+| | | | | | | | | | | | | call name_29
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | call name_1
+| | | | | | | | | | | | | call name_4
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | name_6:
+| | | | | | | | | | | | | name_9:
| | | | | | | | | | | | | | catchFail
| | | | | | | | | | | | | | <try>
| | | | | | | | | | | | | | | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> (\u5 -> (u1 u3) (u4 u5))))))
-| | | | | | | | | | | | | | | call name_23
+| | | | | | | | | | | | | | | call name_26
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_5
+| | | | | | | | | | | | | | | call name_8
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_1
+| | | | | | | | | | | | | | | call name_4
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_6
+| | | | | | | | | | | | | | | call name_9
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | ret
@@ -769,18 +769,18 @@ name_12:
| | | | | | | | | | | | | | | ret
| | | | | | | | | | | | | | <default>
| | | | | | | | | | | | | | fail
-| | | | | | | | | | | | | call name_6
+| | | | | | | | | | | | | call name_9
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | name_17:
+| | | | | | | | | | | | | name_20:
| | | | | | | | | | | | | | push (\u1 -> (\u2 -> ';'))
| | | | | | | | | | | | | | read (';' ==)
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | call name_26
+| | | | | | | | | | | | | | call name_29
| | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | ret
-| | | | | | | | | | | | | call name_17
+| | | | | | | | | | | | | call name_20
| | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | popFail
| | | | | | | | | | | | | popFail
@@ -800,15 +800,15 @@ name_12:
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | read ('r' ==)
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_4
+| | | | | | | | | | | | | | | call name_7
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_2
+| | | | | | | | | | | | | | | call name_5
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | | | | | call name_26
+| | | | | | | | | | | | | | | call name_29
| | | | | | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | | | | | popFail
| | | | | | | | | | | | | | | refJoin join_46
@@ -823,7 +823,7 @@ name_12:
| | | | | | | | | | | | lift Term
| | | | | | | | | | | | choices [(\u1 -> u1)]
| | | | | | | | | | | | <branch>
-| | | | | | | | | | | | | call name_10
+| | | | | | | | | | | | | call name_13
| | | | | | | | | | | | | refJoin join_46
| | | | | | | | | | | | <default>
| | | | | | | | | | | | fail
@@ -836,9 +836,9 @@ name_12:
| | | | | | | | | | choices [(\u1 -> u1)]
| | | | | | | | | | <branch>
| | | | | | | | | | | push (\u1 -> (\u2 -> u1))
-| | | | | | | | | | | call name_1
+| | | | | | | | | | | call name_4
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | | | | | | call name_17
+| | | | | | | | | | | call name_20
| | | | | | | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | | | | | | refJoin join_46
| | | | | | | | | | <default>
@@ -856,18 +856,18 @@ name_12:
| | | | | | | | ret
| | | | | | | <default>
| | | | | | | fail
-| | | | | | call name_15
+| | | | | | call name_18
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_10
+| | | | | | call name_13
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | read ('}' ==)
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | | call name_26
+| | | | | | call name_29
| | | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | | ret
-| | | | | call name_29
+| | | | | call name_3
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_12
+| | | | | call name_15
| | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | popFail
| | | | | ret
@@ -876,9 +876,9 @@ name_12:
| | | | | push (\u1 -> (\u2 -> (\u3 -> Term)))
| | | | | read (':' ==)
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_26
+| | | | | call name_29
| | | | | lift (\u1 -> (\u2 -> u1 u2))
-| | | | | call name_25
+| | | | | call name_28
| | | | | lift (\u1 -> (\u2 -> u1 u2))
| | | | | popFail
| | | | | refJoin join_46
@@ -887,7 +887,7 @@ name_12:
| | | | lift Term
| | | | choices [(\u1 -> u1)]
| | | | <branch>
-| | | | | call name_10
+| | | | | call name_13
| | | | | refJoin join_46
| | | | <default>
| | | | fail
@@ -906,9 +906,9 @@ name_12:
| | ret
| <default>
| fail
-call name_12
+call name_15
lift (\u1 -> (\u2 -> u1 u2))
-call name_10
+call name_13
lift (\u1 -> (\u2 -> u1 u2))
join_46:
| lift (\u1 -> (\u2 -> u1 u2))
diff --git a/test/Golden/Machine/some-string.dump b/test/Golden/Machine/some-string.dump
index 84cbe8b..87f9594 100644
--- a/test/Golden/Machine/some-string.dump
+++ b/test/Golden/Machine/some-string.dump
@@ -1,5 +1,5 @@
push (\u1 -> (\u2 -> u1 : u2 Term))
-name_2:
+name_1:
| catchFail
| <try>
| | push (\u1 -> (\u2 -> (\u3 -> (\u4 -> 'a' : ('b' : ('c' : ('d' : Term)))))))
@@ -16,16 +16,16 @@ name_2:
| <handler>
| loadInput
| fail
-call name_2
+call name_1
lift (\u1 -> (\u2 -> u1 u2))
-name_1:
+name_2:
| catchFail
| <try>
| | push (\u1 -> (\u2 -> (\u3 -> u1 : u2 u3)))
-| | call name_2
-| | lift (\u1 -> (\u2 -> u1 u2))
| | call name_1
| | lift (\u1 -> (\u2 -> u1 u2))
+| | call name_2
+| | lift (\u1 -> (\u2 -> u1 u2))
| | popFail
| | ret
| <handler>
@@ -37,6 +37,6 @@ name_1:
| | ret
| <default>
| fail
-call name_1
+call name_2
lift (\u1 -> (\u2 -> u1 u2))
ret
--
2.49.0