Update tests

test/results/closure capture environment.ans

@@ -0,0 +1,7 @@
+--# run #--
+--- text ---
+| {}"" {}"12" {}"" |
+--- return ---
+()
+--# saved #--
+{}

test/results/resume from paragraph with nested choice 2.ans

@@ -0,0 +1,28 @@
+--# run #--
+--- text ---
+| {}"g:" |
+--- choice ---
+ > | {}"a" |
+=> | {}"b" |
+--- text ---
+| {}"-> b" |
+| {}"autoflush" |
+--- choice ---
+=> | {}"c" |
+--- text ---
+| {}"-> c" |
+| {}"g from #p:" |
+--- choice ---
+ > | {}"aa" |
+=> | {}"ab" |
+--- text ---
+| {}"-> ab" |
+| {}"autoflush" |
+--- choice ---
+=> | {}"c" |
+--- text ---
+| {}"-> c" |
+--- return ---
+()
+--# saved #--
+{"g.checkpoint":#p, "g.run":2}

test/results/resume from paragraph with nested choice 3.ans

@@ -0,0 +1,24 @@
+--# run #--
+--- text ---
+| {}"h:" |
+--- choice ---
+=> | {}"a" |
+ > | {}"b" |
+ > | {}"c" |
+--- text ---
+| {}"-> a" |
+--- choice ---
+=> | {}"aa" |
+ > | {}"ab" |
+--- text ---
+| {}"-> aa" |
+| {}"h from #p:" |
+--- choice ---
+=> | {}"aa" |
+ > | {}"ab" |
+--- text ---
+| {}"-> aa" |
+--- return ---
+()
+--# saved #--
+{"h.checkpoint":#p, "h.reached":*{#p:1}, "h.run":2}

test/results/resume from paragraph with nested choice 4.ans

@@ -0,0 +1,24 @@
+--# run #--
+--- text ---
+| {}"i:" |
+--- choice ---
+=> | {}"a" |
+ > | {}"b" |
+ > | {}"c" |
+--- text ---
+| {}"-> a" |
+--- choice ---
+=> | {}"aa" |
+ > | {}"ab" |
+--- text ---
+| {}"-> aa" |
+| {}"i from #p:" |
+--- choice ---
+=> | {}"aa" |
+ > | {}"ab" |
+--- text ---
+| {}"-> aa" |
+--- return ---
+()
+--# saved #--
+{"i.checkpoint":#p, "i.reached":*{#p:1}, "i.run":2}

test/results/resume from paragraph with nested choice.ans

@@ -16,70 +16,11 @@
 => | {}"ab" |
 --- text ---
 | {}"-> ab" |
---- text ---
-| {}"g:" |
---- choice ---
- > | {}"a" |
-=> | {}"b" |
---- text ---
-| {}"-> b" |
-| {}"autoflush" |
 --- choice ---
 => | {}"c" |
 --- text ---
 | {}"-> c" |
-| {}"g from #p:" |
---- choice ---
- > | {}"aa" |
-=> | {}"ab" |
---- text ---
-| {}"-> ab" |
-| {}"autoflush" |
---- choice ---
-=> | {}"c" |
---- text ---
-| {}"-> c" |
---- text ---
-| {}"h:" |
---- choice ---
-=> | {}"a" |
- > | {}"b" |
- > | {}"c" |
---- text ---
-| {}"-> a" |
---- choice ---
-=> | {}"aa" |
- > | {}"ab" |
---- text ---
-| {}"-> aa" |
-| {}"h from #p:" |
---- choice ---
-=> | {}"aa" |
- > | {}"ab" |
- > | {}"c" |
---- text ---
-| {}"-> aa" |
---- text ---
-| {}"i:" |
---- choice ---
-=> | {}"a" |
- > | {}"b" |
- > | {}"c" |
---- text ---
-| {}"-> a" |
---- choice ---
-=> | {}"aa" |
- > | {}"ab" |
---- text ---
-| {}"-> aa" |
-| {}"i from #p:" |
---- choice ---
-=> | {}"aa" |
- > | {}"ab" |
- > | {}"c" |
---- text ---
-| {}"-> aa" |
 --- return ---
 ()
 --# saved #--
-{"f.checkpoint":#p, "f.run":2, "g.checkpoint":#p, "g.run":2, "h.checkpoint":#p, "h.reached":*{#p:1}, "h.run":2, "i.checkpoint":#p, "i.reached":*{#p:1}, "i.run":2}
+{"f.checkpoint":#p, "f.run":2}

test/tests/closure capture environment.ans

@@ -0,0 +1,10 @@
+:f = ()
+:a = 12
+
+_
+	f = $
+		|{a}
+
+	:a = 42
+
+	f!

test/tests/resume from paragraph with nested choice 2.ans

@@ -0,0 +1,22 @@
+:@choice=1
+:g = "g"!script($_)
+	| a |>
+		|-> a
+		#p!checkpoint
+		| aa |>
+			|-> aa
+		| ab |>
+			|-> ab
+	| b |>
+		|-> b
+	choice = 2
+	|autoflush
+	| c |>
+		|-> c
+	choice = 1
+
+| g:
+g!
+
+| g from #p:
+g!from(#p)

test/tests/resume from paragraph with nested choice 3.ans

@@ -0,0 +1,22 @@
+:@choice = 1
+:h = "h"!script($_)
+	if(1)
+		| a |>
+			|-> a
+			#p!checkpoint
+			| aa |>
+				|-> aa
+			| ab |>
+				|-> ab
+			choice = 1
+		| b |>
+			|-> b
+	| c |>
+		|-> c
+	choice = 1
+
+| h:
+h!
+
+| h from #p:
+h!from(#p)

test/tests/resume from paragraph with nested choice 4.ans

@@ -0,0 +1,20 @@
+:@choice = 1
+:i = "i"!script($_)
+	| a |>
+		|-> a
+		#p!checkpoint
+		| aa |>
+			|-> aa
+		| ab |>
+			|-> ab
+	| b |>
+		|-> b
+	if(1)
+		| c |>
+			|-> c
+
+| i:
+i!
+
+| i from #p:
+i!from(#p)

test/tests/resume from paragraph with nested choice.ans

@@ -21,67 +21,3 @@ f!
 
 | f from #p:
 f!from(#p)
-
-:g = "g"!script($_)
-	| a |>
-		|-> a
-		#p!checkpoint
-		| aa |>
-			|-> aa
-		| ab |>
-			|-> ab
-	| b |>
-		|-> b
-	choice = 2
-	|autoflush
-	| c |>
-		|-> c
-	choice = 1
-
-| g:
-g!
-
-| g from #p:
-g!from(#p)
-
-:h = "h"!script($_)
-	if(1)
-		| a |>
-			|-> a
-			#p!checkpoint
-			| aa |>
-				|-> aa
-			| ab |>
-				|-> ab
-			choice = 1
-		| b |>
-			|-> b
-	| c |>
-		|-> c
-	choice = 1
-
-| h:
-h!
-
-| h from #p:
-h!from(#p)
-
-:i = "i"!script($_)
-	| a |>
-		|-> a
-		#p!checkpoint
-		| aa |>
-			|-> aa
-		| ab |>
-			|-> ab
-	| b |>
-		|-> b
-	if(1)
-		| c |>
-			|-> c
-
-| i:
-i!
-
-| i from #p:
-i!from(#p)