Update tests

test/tests/binary operator overload.ans

@@ -1,8 +1,8 @@
 :$ a - b
-	@"generic minus"
+	return("generic minus")
 
 :$ a::string - b::string
-	@a + " minus " + b
+	return(a + " minus " + b)
 
 | {2-5}
 

test/tests/choice line interpolation with choice event.ans

@@ -3,7 +3,7 @@
 :$ jump button
 	1 # |A
 	| Suprise choice! |> ()
-	@"JOIN"
+	return("JOIN")
 
 | Press {jump button!} to jump. |>
 	|ok

test/tests/choice line interpolation with event flush.ans

@@ -3,7 +3,7 @@
 :$ jump button
 	1 # | a
 
-	@"SPLIT"
+	return("SPLIT")
 
 | Press {jump button!} to jump. |>
 	| ok

test/tests/choice line interpolation with text event.ans

@@ -1,9 +1,9 @@
 :$ jump button
-	@1 # | A
+	return(1 # | A)
 
 :$ move axis
 	1 # | left
-	@" joystick"
+	return(" joystick")
 
 | Press {jump button!} to jump. |>
 	|ok

test/tests/choice with decorators.ans

@@ -1,16 +1,17 @@
-1 ~ | a |>
-	| -> a
+if(1)
+	| a |>
+		| -> a
 | b |>
 	| -> b
 :@choice = 1
 
-1 ~ | a |>
+if(1, $| a |> _)
 	| -> a
 | b |>
 	| -> b
 choice = 2
 
-() ~ | a |>
+if((), $| a |> _)
 	| -> a
 | b |>
 	| -> b
@@ -22,13 +23,13 @@ choice = 1
 	| -> b
 choice = 2
 
-12 # () ~ | a |>
+12 # if((), $| a |> _)
 	| -> a
 3 # | b |>
 	| -> b
 choice = 1
 
-12 # 1 ~ | a |>
+12 # if(1, $| a |> _)
 	| -> a
 3 # | b |>
 	| -> b

test/tests/condition decorator.ans

@@ -1,3 +1,3 @@
-() ~ |ko
-1 ~ |ok
-1 ~ |ok bis
+if((), $|ko)
+if(1, $|ok)
+if(1, $|ok bis)

test/tests/condition else false.ans

@@ -1,6 +1,6 @@
 :a = 5
 
-a == 2 ~
+if(a == 2)
 	|ko
-~
+else!
 	|ok

test/tests/condition else true.ans

@@ -1,6 +1,6 @@
 :a = 5
 
-a == 5 ~
+if(a == 5)
 	|ok
-~
+else!
 	|ko

test/tests/condition elseif false.ans

@@ -1,8 +1,8 @@
 :a = 5
 
-a == 2 ~
+if(a == 2)
 	|ko
-~ () ~
+else if(())
 	|ko
-~
+else!
 	|ok

test/tests/condition elseif true.ans

@@ -1,8 +1,8 @@
 :a = 5
 
-a == 2 ~
+if(a == 2)
 	|ko
-~ 1 ~
+else if(1)
 	|ok
-~
+else!
 	|ko

test/tests/condition false.ans

@@ -1,4 +1,4 @@
 :a = 5
 
-a == 2 ~
+if(a == 2)
 	|ko

test/tests/condition operator.ans

@@ -1,6 +1,6 @@
 :$ f
-	@|b
+	return(|b)
 
-|a {5 ~ f!} c
+|a {if(5, f)} c
 
-|a {() ~ f!} c
+|a {if((), f)} c

test/tests/condition true.ans

@@ -1,4 +1,4 @@
 :a = 5
 
-a == 5 ~
+if(a == 5)
 	|ok

test/tests/custom text formatting.ans

@@ -2,10 +2,10 @@
 
 :$ format(p::is(person))
 	p = p!value
-	@"Name: {p("name")}\nAge: {p("age")}"
+	return("Name: {p("name")}\nAge: {p("age")}")
 
 :$ Person(name, age)
-	@{"name":name, "age":age}!type(person)
+	return({"name":name, "age":age}!type(person))
 
 :abject = Person("Darmanin", 38)
 

test/tests/default attached block.ans

@@ -0,0 +1,4 @@
+:fn = "fn"!script
+	|ok
+
+fn!

test/tests/function assignement.ans

@@ -1,7 +1,7 @@
 :a = 5
 
 :$ f(p)
-	@a
+	return(a)
 
 :$ f(p) = v
 	|v={v}

test/tests/function definition.ans

@@ -1,7 +1,7 @@
 :f = $(x)x*x
 
 :$g(x)
-	@x*x
+	return(x*x)
 
 |{f(5)} = {g(5)}
 

test/tests/function return exit function nested.ans

@@ -1,8 +1,8 @@
 :$ hey
 	:@$ foo
-		@2
-		@3
-	@5
+		return(2)
+		return(3)
+	return(5)
 	|u
 
 |{hey!}

test/tests/function return exit function.ans

@@ -1,6 +1,6 @@
 :$ hey
-	@5
+	return(5)
 	|a
-	@2
+	return(2)
 
 |{hey!}

test/tests/function return nested.ans

@@ -1,7 +1,7 @@
 :$ hey
 	:@$ foo
-		@2
-	@5
+		return(2)
+	return(5)
 
 |{hey!}
 |{hey.foo!}

test/tests/function return.ans

@@ -1,4 +1,4 @@
 :$ hey
-	@5
+	return(5)
 
 |{hey!}

test/tests/function scoped mutable.ans

@@ -11,7 +11,7 @@
 
 	|before recursion {c}: {a}
 
-	n < 5 ~
+	if(n < 5)
 		f(c+1)
 
 		|after recursion {c}: {a}
@@ -29,7 +29,7 @@ f!
 
 	|before recursion {c}: {a}
 
-	n < 5 ~
+	if(n < 5)
 		g(c+1, a)
 
 		|after recursion {c}: {a}

test/tests/function scoped recursive.ans

@@ -11,7 +11,7 @@
 
 	|before recursion {c}: {a}
 
-	n < 5 ~
+	if(n < 5)
 		f(c+1)
 
 		|after recursion {c}: {a}

test/tests/function selection.ans

@@ -1,9 +1,9 @@
 :$ a(x::number)
-	@x + 2
+	return(x + 2)
 
 :$ x
 	:$ a(x::string)
-		@x + "heh"
+		return(x + "heh")
 
 	|{a("plop")}
 

test/tests/function type dispatch with default.ans

@@ -11,10 +11,10 @@ fn(5)
 fn()
 
 :$ g(n="s", a::number=5)
-	@"gn"
+	return("gn")
 
 :$ g(n="s", a::string="lol")
-	@"gs"
+	return("gs")
 
 |{g(n="k", a="l")}
 |{g(n="k", a=1)}

test/tests/lazy boolean operators.ans

@@ -1,10 +1,10 @@
 :$ a
 	|a
-	@1
+	return(1)
 
 :$ b
 	|b
-	@()
+	return(())
 
 |{a! & b!} = a b ()
 

test/tests/loop decorator.ans

@@ -1,5 +1,5 @@
 :i = 0
 
-(i += 1; i <= 10) ~? (| {i}\n)!
+while($()(i += 1; i <= 10), $| {i}\n |!)
 
 |{i}

test/tests/named arguments.ans

@@ -1,4 +1,4 @@
 :$ f(a, b, c)
-	@a + b + c
+	return(a + b + c)
 
 |{f("a", "b", "c")} = {f(a="a", b="b", c="c")} = {f(c="c", a="a", b="b")}

test/tests/nested conditions.ans

@@ -1,19 +1,19 @@
-1 ~
+if(1)
 	|yes
-	() ~
+	if(())
 		|no
-~
+else!
 	|nope
-	1 ~
+	if(1)
 		|niet
-		() ~
+		if(())
 			|still no
-~
+else!
 	|nein
 
-() ~
+if(())
 	|nah
-~
+else!
 	|ye
-	~
+	else!
 		|da

test/tests/nested flush.ans

@@ -1,18 +1,18 @@
-1 ~
+if(1)
 	|a
 
 |b
 
-1 ~
+if(1)
 	|c
 |d
 
-1 ~
+if(1)
 	|e
 
 | f |> ()
 :@choice = 1
 
-1 ~
+if(1)
 	|g
 | h |> ()

test/tests/optional arguments.ans

@@ -1,4 +1,4 @@
 :$ f(a, b, c="c")
-	@a + b + c
+	return(a + b + c)
 
 |{f("a", "b")} = {f("a", "b", "c")} = {f(b="b", a="a")}

test/tests/resume from paragraph restore tags.ans

@@ -1,7 +1,7 @@
-:f = "f"!script($_)
+:f = "f"!script
 	"a":"a" #
 		|a
-		1 ~ "x":"x" #
+		if(1, $()("x":"x" # _))
 			"b":"b" #
 				#p!checkpoint($_)
 					"c":"c"# |b

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

@@ -45,7 +45,7 @@ g!
 g!from(#p)
 
 :h = "h"!script($_)
-	1 ~
+	if(1)
 		| a |>
 			|-> a
 			#p!checkpoint
@@ -76,7 +76,7 @@ h!from(#p)
 			|-> ab
 	| b |>
 		|-> b
-	1 ~
+	if(1)
 		| c |>
 			|-> c
 

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

@@ -1,8 +1,8 @@
 :f = "f"!script($_)
-	1 ~
+	if(1)
 		#p!checkpoint
 		|x
-	~
+	else!
 		|y
 
 f!
@@ -10,10 +10,10 @@ f!
 f!from(#p)
 
 :g = "g"!script($_)
-	() ~
+	if(())
 		#p!checkpoint
 		|x
-	~
+	else!
 		|y
 
 g!

test/tests/return children.ans

@@ -1,13 +1,13 @@
 :$ fn
     :i=0
-    @
+    return(_)
         i=50
         i
 
 | {fn!} = 50
 
 :$ g
-    @
-        @3
+    return(_)
+        return(3)
 
 | {g!} = 3

test/tests/return in choice.ans

@@ -1,10 +1,10 @@
 :$ f
 	| a |>
 		| x
-		@1
+		return(1)
 		| y
-	@2
+	return(2)
 
-f! == 2 ~
+if(f! == 2)
 	:@choice = 1
 	| Yes.

test/tests/scope checkpoint mutable bis error.ans

@@ -12,7 +12,7 @@
 	|CHECK
 	merge branch!
 
-	n < 1 ~
+	if(n < 1)
 		|REC
 
 		n += 1

test/tests/scope checkpoint mutable bis.ans

@@ -12,7 +12,7 @@
 	|CHECK
 	merge branch!
 
-	n < 1 ~
+	if(n < 1)
 		|REC
 
 		n += 1

test/tests/scope checkpoint mutable error.ans

@@ -10,7 +10,7 @@
 	|CHECK
 	merge branch!
 
-	n < 1 ~
+	if(n < 1)
 		|REC
 
 		n += 1

test/tests/scope checkpoint mutable ter error.ans

@@ -12,7 +12,7 @@
 	|CHECK
 	merge branch!
 
-	n < 1 ~
+	if(n < 1)
 		|REC
 
 		n += 1

test/tests/scope checkpoint mutable ter.ans

@@ -12,7 +12,7 @@
 	|CHECK
 	merge branch!
 
-	n < 1 ~
+	if(n < 1)
 		|REC
 
 		n += 1

test/tests/scope checkpoint mutable.ans

@@ -10,7 +10,7 @@
 	|CHECK
 	merge branch!
 
-	n < 1 ~
+	if(n < 1)
 		|REC
 
 		n += 1

test/tests/tag decorator nested.ans

@@ -1,4 +1,4 @@
 1 #
 	|foo
-	1 ~ "b":[1,2] #
-		1 ~ "a":[2,3] # | bar
+	if(1, $()("b":[1,2] # _))
+		if(1, $()("a":[2,3] # | bar))

test/tests/tag operator.ans

@@ -1,5 +1,5 @@
 :$ f
-	@"b"
+	return("b")
 
 |a {5 # |{f!}} c
 

test/tests/text buffer with tags.ans

@@ -1,8 +1,8 @@
 :$ f
 	1 # | lol
 
-	@2 # |d
+	return(2 # |d)
 
 :a = |a {f!} {3#|t} b
 
-@a
+return(a)

test/tests/text buffer.ans

@@ -1,8 +1,8 @@
 :$ f
 	|lol
 
-	@|d
+	return(|d)
 
 :a = |a {f!} b
 
-@a
+return(a)

test/tests/text line interpolation with choice event.ans

@@ -9,7 +9,7 @@
 	1 # | left
 	| Surprise choice! |>
 		| ok2
-	@" joystick"
+	return(" joystick")
 
 | Press {jump button!} to jump.
 

test/tests/text line interpolation with event flush.ans

@@ -1,12 +1,12 @@
 :$ jump button
 	1 # | A
 
-	@
+	return!
 
 :$ move axis
 	1 # | left
 
-	@" joystick"
+	return(" joystick")
 
 | Press {jump button!} to jump.
 

test/tests/text line interpolation with text event.ans

@@ -1,9 +1,9 @@
 :$ jump button
-	@1 # | A
+	return(1 # | A)
 
 :$ move axis
 	2 # | left
-	@" joystick"
+	return(" joystick")
 
 | Press {jump button!} to jump.
 

test/tests/unary operator overload.ans

@@ -1,8 +1,8 @@
 :$ -f
-	@"generic minus"
+	return("generic minus")
 
 :$ -f::string
-	@"minus "+f
+	return("minus "+f)
 
 |{-5}
 

test/tests/unseen line.ans

@@ -1,6 +1,6 @@
 : x = "x"!script($_)
 	|a
-	run == 0 ~ |seen only once
+	if(run == 0, $|seen only once)
 	|b
 
 x!

test/tests/while break.ans

@@ -0,0 +1,10 @@
+:i = 0
+while($i <= 10)
+	| {i}
+
+	if(i == 5)
+		break!
+
+	i += 1
+
+|ok

test/tests/while continue.ans

@@ -0,0 +1,10 @@
+:i = 0
+while($i <= 5)
+	i += 1
+
+	if(i == 3)
+		continue!
+
+	| {i}
+
+|ok

test/tests/while loop else.ans

@@ -2,18 +2,18 @@
 
 | Start with i={i}:
 
-i < 5 ~?
+while($i < 5)
 	| {i}
 
 	i += 1
-~
+else!
 	| Loop not ran.
 
 | Start with i={i}:
 
-i < 5 ~?
+while($i < 5)
 	| {i}
 
 	i += 1
-~
+else!
 	| Loop not ran.

test/tests/while loop.ans

@@ -1,5 +1,5 @@
 :i = 0
-i <= 10 ~?
+while($i <= 10)
 	| {i}
 
 	i += 1
@@ -7,10 +7,10 @@ i <= 10 ~?
 | return in loop:
 
 i = 0
-i <= 10 ~?
+while($i <= 10)
 	| {i}
 
-	i == 5 ~
-		@()
+	if(i == 5)
+		return!
 
 	i += 1