Suffixes imperative stuff with '!', adds ({set,list} ... ) shorthands.

20 files changed, 585 insertions, 498 deletions

diff --git a/data/unit-testing/access.fate b/data/unit-testing/access.fate
index fe92293..e665b69 100644
--- a/data/unit-testing/access.fate
+++ b/data/unit-testing/access.fate
@@ -3,23 +3,23 @@
 (global (list int) li)
 (global (ptr (list int)) li_ptr)
 
-(set li (range 0 10 1))
-(set li_ptr (ptr li))
+(set! li (range 0 10 1))
+(set! li_ptr (ptr li))
 
 (global int i)
 
-(for (set i 0) (=< i 10) (set i (+ i 1))
-   (assert (= (access i li) (var i))
+(for (set! i 0) (=< i 10) (set! i (+ i 1))
+   (assert! (= (access i li) (var i))
       [FAILED] ACCESS assert failed on (var i) for li.
    )
-   (assert (= (access i li_ptr) (var i))
+   (assert! (= (access i li_ptr) (var i))
       [FAILED] ACCESS assert failed on (var i) with for li_ptr.
    )
-   (assert (= (access i (range 0 10 1)) (var i))
+   (assert! (= (access i (range 0 10 1)) (var i))
       [FAILED] ACCESS assert failed on (var i) with for range.
    )
 )
 
 [COMPLETED] ACCESS
 
-(end)
+(end!)
diff --git a/data/unit-testing/access_constant_index.fate b/data/unit-testing/access_constant_index.fate
index 7399289..be3c3fa 100644
--- a/data/unit-testing/access_constant_index.fate
+++ b/data/unit-testing/access_constant_index.fate
@@ -2,57 +2,57 @@
 
 (global string test_name)
 
-(set test_name ( ACCESS CONSTANT INDEX ))
+(set! test_name ( ACCESS CONSTANT INDEX ))
 
 (global (list int) li)
 (global (ptr (list int)) li_ptr)
 
-(set li (range 0 10 1))
-(set li_ptr (ptr li))
-
-(assert (= (var li.0) 0) [FAILED] (var test_name) li.0)
-(assert (= (var li.1) 1) [FAILED] (var test_name) li.1)
-(assert (= (var li.2) 2) [FAILED] (var test_name) li.2)
-(assert (= (var li.3) 3) [FAILED] (var test_name) li.3)
-(assert (= (var li.4) 4) [FAILED] (var test_name) li.4)
-(assert (= (var li.5) 5) [FAILED] (var test_name) li.5)
-(assert (= (var li.6) 6) [FAILED] (var test_name) li.6)
-(assert (= (var li.7) 7) [FAILED] (var test_name) li.7)
-(assert (= (var li.8) 8) [FAILED] (var test_name) li.8)
-(assert (= (var li.9) 9) [FAILED] (var test_name) li.9)
-(assert (= (var li.10) 10) [FAILED] (var test_name) li.10)
-
-(assert (= (var li_ptr.0) 0) [FAILED] (var test_name) li_ptr.0)
-(assert (= (var li_ptr.1) 1) [FAILED] (var test_name) li_ptr.1)
-(assert (= (var li_ptr.2) 2) [FAILED] (var test_name) li_ptr.2)
-(assert (= (var li_ptr.3) 3) [FAILED] (var test_name) li_ptr.3)
-(assert (= (var li_ptr.4) 4) [FAILED] (var test_name) li_ptr.4)
-(assert (= (var li_ptr.5) 5) [FAILED] (var test_name) li_ptr.5)
-(assert (= (var li_ptr.6) 6) [FAILED] (var test_name) li_ptr.6)
-(assert (= (var li_ptr.7) 7) [FAILED] (var test_name) li_ptr.7)
-(assert (= (var li_ptr.8) 8) [FAILED] (var test_name) li_ptr.8)
-(assert (= (var li_ptr.9) 9) [FAILED] (var test_name) li_ptr.9)
-(assert (= (var li_ptr.10) 10) [FAILED] (var test_name) li_ptr.10)
+(set! li (range 0 10 1))
+(set! li_ptr (ptr li))
+
+(assert! (= (var li.0) 0) [FAILED] (var test_name) li.0)
+(assert! (= (var li.1) 1) [FAILED] (var test_name) li.1)
+(assert! (= (var li.2) 2) [FAILED] (var test_name) li.2)
+(assert! (= (var li.3) 3) [FAILED] (var test_name) li.3)
+(assert! (= (var li.4) 4) [FAILED] (var test_name) li.4)
+(assert! (= (var li.5) 5) [FAILED] (var test_name) li.5)
+(assert! (= (var li.6) 6) [FAILED] (var test_name) li.6)
+(assert! (= (var li.7) 7) [FAILED] (var test_name) li.7)
+(assert! (= (var li.8) 8) [FAILED] (var test_name) li.8)
+(assert! (= (var li.9) 9) [FAILED] (var test_name) li.9)
+(assert! (= (var li.10) 10) [FAILED] (var test_name) li.10)
+
+(assert! (= (var li_ptr.0) 0) [FAILED] (var test_name) li_ptr.0)
+(assert! (= (var li_ptr.1) 1) [FAILED] (var test_name) li_ptr.1)
+(assert! (= (var li_ptr.2) 2) [FAILED] (var test_name) li_ptr.2)
+(assert! (= (var li_ptr.3) 3) [FAILED] (var test_name) li_ptr.3)
+(assert! (= (var li_ptr.4) 4) [FAILED] (var test_name) li_ptr.4)
+(assert! (= (var li_ptr.5) 5) [FAILED] (var test_name) li_ptr.5)
+(assert! (= (var li_ptr.6) 6) [FAILED] (var test_name) li_ptr.6)
+(assert! (= (var li_ptr.7) 7) [FAILED] (var test_name) li_ptr.7)
+(assert! (= (var li_ptr.8) 8) [FAILED] (var test_name) li_ptr.8)
+(assert! (= (var li_ptr.9) 9) [FAILED] (var test_name) li_ptr.9)
+(assert! (= (var li_ptr.10) 10) [FAILED] (var test_name) li_ptr.10)
 
 (global (list (list int)) lili)
 (global int i)
 
-(for (set i 0) (=< i 10) (set i (+ i 1))
+(for (set! i 0) (=< i 10) (set! i (+ i 1))
    (add! (range 0 i 1) lili)
 )
 
-(assert (= (var lili.10.0) 0) [FAILED] (var test_name) lili.10.0 was (var lili.10.0).)
-(assert (= (var lili.9.1) 1) [FAILED] (var test_name) lili.9.1 was (var lili.9.1).)
-(assert (= (var lili.8.2) 2) [FAILED] (var test_name) lili.8.2 was (var lili.8.2).)
-(assert (= (var lili.7.3) 3) [FAILED] (var test_name) lili.7.3 was (var lili.7.3).)
-(assert (= (var lili.6.4) 4) [FAILED] (var test_name) lili.6.4 was (var lili.6.4).)
-(assert (= (var lili.5.5) 5) [FAILED] (var test_name) lili.5.5 was (var lili.5.5).)
-(assert (= (var lili.4.3) 3) [FAILED] (var test_name) lili.4.3 was (var lili.4.3).)
-(assert (= (var lili.3.2) 2) [FAILED] (var test_name) lili.3.2 was (var lili.3.2).)
-(assert (= (var lili.2.1) 1) [FAILED] (var test_name) lili.2.1 was (var lili.2.1).)
-(assert (= (var lili.1.0) 0) [FAILED] (var test_name) lili.1.0 was (var lili.1.0).)
-(assert (= (var lili.0.0) 0) [FAILED] (var test_name) lili.0.0 was (var lili.0.0).)
+(assert! (= (var lili.10.0) 0) [FAILED] (var test_name) lili.10.0 was (var lili.10.0).)
+(assert! (= (var lili.9.1) 1) [FAILED] (var test_name) lili.9.1 was (var lili.9.1).)
+(assert! (= (var lili.8.2) 2) [FAILED] (var test_name) lili.8.2 was (var lili.8.2).)
+(assert! (= (var lili.7.3) 3) [FAILED] (var test_name) lili.7.3 was (var lili.7.3).)
+(assert! (= (var lili.6.4) 4) [FAILED] (var test_name) lili.6.4 was (var lili.6.4).)
+(assert! (= (var lili.5.5) 5) [FAILED] (var test_name) lili.5.5 was (var lili.5.5).)
+(assert! (= (var lili.4.3) 3) [FAILED] (var test_name) lili.4.3 was (var lili.4.3).)
+(assert! (= (var lili.3.2) 2) [FAILED] (var test_name) lili.3.2 was (var lili.3.2).)
+(assert! (= (var lili.2.1) 1) [FAILED] (var test_name) lili.2.1 was (var lili.2.1).)
+(assert! (= (var lili.1.0) 0) [FAILED] (var test_name) lili.1.0 was (var lili.1.0).)
+(assert! (= (var lili.0.0) 0) [FAILED] (var test_name) lili.0.0 was (var lili.0.0).)
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/access_pointer.fate b/data/unit-testing/access_pointer.fate
index c98c31a..9ec3e44 100644
--- a/data/unit-testing/access_pointer.fate
+++ b/data/unit-testing/access_pointer.fate
@@ -2,99 +2,99 @@
 
 (global string test_name)
 
-(set test_name ( ACCESS POINTER ))
+(set! test_name ( ACCESS POINTER ))
 
 (global (list int) li)
 (global (ptr (list int)) li_ptr)
 
-(set li (range 0 10 1))
-(set li_ptr (ptr li))
+(set! li (range 0 10 1))
+(set! li_ptr (ptr li))
 
 (global int i)
 
-(for (set i 0) (=< i 10) (set i (+ i 1))
-   (assert (= (at (access_ptr i li)) (var i))
+(for (set! i 0) (=< i 10) (set! i (+ i 1))
+   (assert! (= (at (access_ptr i li)) (var i))
       [FAILED] ACCESS POINTER assert failed on (var i) for li.
    )
-   (assert (= (at (access_ptr i li_ptr)) (var i))
+   (assert! (= (at (access_ptr i li_ptr)) (var i))
       [FAILED] ACCESS POINTER assert failed on (var i) with for li_ptr.
    )
 )
 
 (global (list (list int)) lili)
 
-(for (set i 0) (=< i 10) (set i (+ i 1))
+(for (set! i 0) (=< i 10) (set! i (+ i 1))
    (add! (range 0 i 1) lili)
 )
 
-(assert
+(assert!
    (= (at (access_ptr 0 (at (access_ptr 10 lili)))) 0)
    [FAILED] (var test_name) lili.10.0 was
    (at (access_ptr 0 (at (access_ptr 10 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 1 (at (access_ptr 9 lili)))) 1)
    [FAILED] (var test_name) lili.9.1 was
    (at (access_ptr 1 (at (access_ptr 9 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 2 (at (access_ptr 8 lili)))) 2)
    [FAILED] (var test_name) lili.8.2 was
    (at (access_ptr 2 (at (access_ptr 8 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 3 (at (access_ptr 7 lili)))) 3)
    [FAILED] (var test_name) lili.7.3 was
    (at (access_ptr 3 (at (access_ptr 7 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 4 (at (access_ptr 6 lili)))) 4)
    [FAILED] (var test_name) lili.6.4 was
    (at (access_ptr 4 (at (access_ptr 6 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 5 (at (access_ptr 5 lili)))) 5)
    [FAILED] (var test_name) lili.5.5 was
    (at (access_ptr 5 (at (access_ptr 5 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 3 (at (access_ptr 4 lili)))) 3)
    [FAILED] (var test_name) lili.4.3 was
    (at (access_ptr 3 (at (access_ptr 4 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 2 (at (access_ptr 3 lili)))) 2)
    [FAILED] (var test_name) lili.3.2 was
    (at (access_ptr 2 (at (access_ptr 3 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 1 (at (access_ptr 2 lili)))) 1)
    [FAILED] (var test_name) lili.2.1 was
    (at (access_ptr 1 (at (access_ptr 2 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 0 (at (access_ptr 1 lili)))) 0)
    [FAILED] (var test_name) lili.1.0 was
    (at (access_ptr 0 (at (access_ptr 1 lili)))) for part A.
 )
-(assert
+(assert!
    (= (at (access_ptr 0 (at (access_ptr 0 lili)))) 0)
    [FAILED] (var test_name) lili.0.0 was
    (at (access_ptr 0 (at (access_ptr 0 lili)))) for part A.
 )
 
-(assert (= (at (access_ptr 0 lili.10)) 0) [FAILED] (var test_name) lili.10.0 was (at (access_ptr 0 lili.10)) for part B.)
-(assert (= (at (access_ptr 1 lili.9)) 1) [FAILED] (var test_name) lili.9.1 was (at (access_ptr 1 lili.9)) for part B.)
-(assert (= (at (access_ptr 2 lili.8)) 2) [FAILED] (var test_name) lili.8.2 was (at (access_ptr 2 lili.8)) for part B.)
-(assert (= (at (access_ptr 3 lili.7)) 3) [FAILED] (var test_name) lili.7.3 was (at (access_ptr 3 lili.7)) for part B.)
-(assert (= (at (access_ptr 4 lili.6)) 4) [FAILED] (var test_name) lili.6.4 was (at (access_ptr 4 lili.6)) for part B.)
-(assert (= (at (access_ptr 5 lili.5)) 5) [FAILED] (var test_name) lili.5.5 was (at (access_ptr 5 lili.5)) for part B.)
-(assert (= (at (access_ptr 3 lili.4)) 3) [FAILED] (var test_name) lili.4.3 was (at (access_ptr 3 lili.4)) for part B.)
-(assert (= (at (access_ptr 2 lili.3)) 2) [FAILED] (var test_name) lili.3.2 was (at (access_ptr 2 lili.3)) for part B.)
-(assert (= (at (access_ptr 1 lili.2)) 1) [FAILED] (var test_name) lili.2.1 was (at (access_ptr 1 lili.2)) for part B.)
-(assert (= (at (access_ptr 0 lili.1)) 0) [FAILED] (var test_name) lili.1.0 was (at (access_ptr 0 lili.1)) for part B.)
-(assert (= (at (access_ptr 0 lili.0)) 0) [FAILED] (var test_name) lili.0.0 was (at (access_ptr 0 lili.0)) for part B.)
+(assert! (= (at (access_ptr 0 lili.10)) 0) [FAILED] (var test_name) lili.10.0 was (at (access_ptr 0 lili.10)) for part B.)
+(assert! (= (at (access_ptr 1 lili.9)) 1) [FAILED] (var test_name) lili.9.1 was (at (access_ptr 1 lili.9)) for part B.)
+(assert! (= (at (access_ptr 2 lili.8)) 2) [FAILED] (var test_name) lili.8.2 was (at (access_ptr 2 lili.8)) for part B.)
+(assert! (= (at (access_ptr 3 lili.7)) 3) [FAILED] (var test_name) lili.7.3 was (at (access_ptr 3 lili.7)) for part B.)
+(assert! (= (at (access_ptr 4 lili.6)) 4) [FAILED] (var test_name) lili.6.4 was (at (access_ptr 4 lili.6)) for part B.)
+(assert! (= (at (access_ptr 5 lili.5)) 5) [FAILED] (var test_name) lili.5.5 was (at (access_ptr 5 lili.5)) for part B.)
+(assert! (= (at (access_ptr 3 lili.4)) 3) [FAILED] (var test_name) lili.4.3 was (at (access_ptr 3 lili.4)) for part B.)
+(assert! (= (at (access_ptr 2 lili.3)) 2) [FAILED] (var test_name) lili.3.2 was (at (access_ptr 2 lili.3)) for part B.)
+(assert! (= (at (access_ptr 1 lili.2)) 1) [FAILED] (var test_name) lili.2.1 was (at (access_ptr 1 lili.2)) for part B.)
+(assert! (= (at (access_ptr 0 lili.1)) 0) [FAILED] (var test_name) lili.1.0 was (at (access_ptr 0 lili.1)) for part B.)
+(assert! (= (at (access_ptr 0 lili.0)) 0) [FAILED] (var test_name) lili.0.0 was (at (access_ptr 0 lili.0)) for part B.)
 
 [COMPLETED] ACCESS POINTER
 
-(end)
+(end!)
diff --git a/data/unit-testing/add_element.fate b/data/unit-testing/add_element.fate
index ccec148..299256f 100644
--- a/data/unit-testing/add_element.fate
+++ b/data/unit-testing/add_element.fate
@@ -2,17 +2,17 @@
 
 (global string test_name)
 
-(set test_name ( ADD ELEMENT ))
+(set! test_name ( ADD ELEMENT ))
 
 (global (list int) li0)
 (global (list int) li1)
 
-(set li0 (add_element -1 li0))
-(set li0 (add_element 0 li0))
-(set li0 (add_element 1 li0))
-(set li0 (add_element 2 li0))
-(set li0 (add_element 3 4 5 li0))
-(set li0 (add_element 6 li0))
+(set! li0 (add_element -1 li0))
+(set! li0 (add_element 0 li0))
+(set! li0 (add_element 1 li0))
+(set! li0 (add_element 2 li0))
+(set! li0 (add_element 3 4 5 li0))
+(set! li0 (add_element 6 li0))
 
 (add_element! -1 li1)
 (add_element! 0 li1)
@@ -21,22 +21,22 @@
 (add_element! 5 li1)
 (add_element! 6 li1)
 
-(assert (= (var li0) (var li1)) [FAILED] (var test_name) equality.)
+(assert! (= (var li0) (var li1)) [FAILED] (var test_name) equality.)
 
-(assert (= (var li0.0) (var li1.0) -1) [FAILED] (var test_name) at 0: (var li0.0), (var li1.0).)
-(assert (= (var li0.1) (var li1.1) 0) [FAILED] (var test_name) at 1: (var li0.1), (var li1.1).)
-(assert (= (var li0.2) (var li1.2) 1) [FAILED] (var test_name) at 2: (var li0.2), (var li1.2).)
-(assert (= (var li0.3) (var li1.3) 2) [FAILED] (var test_name) at 3: (var li0.3), (var li1.3).)
-(assert (= (var li0.4) (var li1.4) 3) [FAILED] (var test_name) at 4: (var li0.4), (var li1.4).)
-(assert (= (var li0.5) (var li1.5) 4) [FAILED] (var test_name) at 5: (var li0.5), (var li1.5).)
-(assert (= (var li0.6) (var li1.6) 5) [FAILED] (var test_name) at 6: (var li0.6), (var li1.6).)
-(assert (= (var li0.7) (var li1.7) 6) [FAILED] (var test_name) at 7: (var li0.7), (var li1.7).)
+(assert! (= (var li0.0) (var li1.0) -1) [FAILED] (var test_name) at 0: (var li0.0), (var li1.0).)
+(assert! (= (var li0.1) (var li1.1) 0) [FAILED] (var test_name) at 1: (var li0.1), (var li1.1).)
+(assert! (= (var li0.2) (var li1.2) 1) [FAILED] (var test_name) at 2: (var li0.2), (var li1.2).)
+(assert! (= (var li0.3) (var li1.3) 2) [FAILED] (var test_name) at 3: (var li0.3), (var li1.3).)
+(assert! (= (var li0.4) (var li1.4) 3) [FAILED] (var test_name) at 4: (var li0.4), (var li1.4).)
+(assert! (= (var li0.5) (var li1.5) 4) [FAILED] (var test_name) at 5: (var li0.5), (var li1.5).)
+(assert! (= (var li0.6) (var li1.6) 5) [FAILED] (var test_name) at 6: (var li0.6), (var li1.6).)
+(assert! (= (var li0.7) (var li1.7) 6) [FAILED] (var test_name) at 7: (var li0.7), (var li1.7).)
 
 (global (list int) ali0)
 (global (list int) ali1)
 
-(set ali0 (add_element 6 (range -1 5 1)))
-(set ali1
+(set! ali0 (add_element 6 (range -1 5 1)))
+(set! ali1
    (add_element 6
       (add_element 5
          (add_element 4
@@ -50,20 +50,20 @@
    )
 )
 
-(assert (= (var li0) (var li1) (var ali0) (var ali1)) [FAILED] (var test_name) equality 2.)
+(assert! (= (var li0) (var li1) (var ali0) (var ali1)) [FAILED] (var test_name) equality 2.)
 
 (global (set int) si0)
 (global (set int) si1)
 (global (ptr (set int)) si_ptr)
 
-(set si_ptr (ptr si1))
+(set! si_ptr (ptr si1))
 
-(set si0 (add_element 6 si0))
-(set si0 (add_element 0 si0))
-(set si0 (add_element 1 4 -1 si0))
-(set si0 (add_element 5 si0))
-(set si0 (add_element 3 si0))
-(set si0 (add_element 2 si0))
+(set! si0 (add_element 6 si0))
+(set! si0 (add_element 0 si0))
+(set! si0 (add_element 1 4 -1 si0))
+(set! si0 (add_element 5 si0))
+(set! si0 (add_element 3 si0))
+(set! si0 (add_element 2 si0))
 
 (add_element! 4 si1)
 (add_element! 0 (at (ptr si1)))
@@ -72,14 +72,14 @@
 (add_element! 1 (at si_ptr))
 (add_element! 5 si1)
 
-(assert (= (var li0) (var li1) (var ali0) (var ali1) (var si0) (var si1)) [FAILED] (var test_name) equality 3.)
+(assert! (= (var li0) (var li1) (var ali0) (var ali1) (var si0) (var si1)) [FAILED] (var test_name) equality 3.)
 
-(set si0 (add_element 0 si0))
-(set si0 (add_element 4 si0))
-(set si0 (add_element 6 5 3 si0))
-(set si0 (add_element -1 si0))
-(set si0 (add_element 2 si0))
-(set si0 (add_element 1 si0))
+(set! si0 (add_element 0 si0))
+(set! si0 (add_element 4 si0))
+(set! si0 (add_element 6 5 3 si0))
+(set! si0 (add_element -1 si0))
+(set! si0 (add_element 2 si0))
+(set! si0 (add_element 1 si0))
 
 (add_element! 4 si1)
 (add_element! 1 0 6 si1)
@@ -88,8 +88,8 @@
 (add_element! 2 si1)
 (add_element! 5 si1)
 
-(assert (= (var li0) (var li1) (var ali0) (var ali1) (var si0) (var si1)) [FAILED] (var test_name) equality 4.)
+(assert! (= (var li0) (var li1) (var ali0) (var ali1) (var si0) (var si1)) [FAILED] (var test_name) equality 4.)
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/add_element_at.fate b/data/unit-testing/add_element_at.fate
index 43e8b1e..a3f73fe 100644
--- a/data/unit-testing/add_element_at.fate
+++ b/data/unit-testing/add_element_at.fate
@@ -2,19 +2,19 @@
 
 (global string test_name)
 
-(set test_name ( ADD ELEMENT AT ))
+(set! test_name ( ADD ELEMENT AT ))
 
 (global (list int) li0)
 (global (list int) li1)
 
-(set li0 (add_element_at 0 0 li0))
-(set li0 (add_element_at 1 1 li0))
-(set li0 (add_element_at 2 2 li0))
-(set li0 (add_element_at 0 -1 li0))
-(set li0 (add_element_at 0 -3 li0))
-(set li0 (add_element_at 1 -2 li0))
-(set li0 (add_element_at 44 3 li0))
-(set li0 (add_element_at -44 -4 li0))
+(set! li0 (add_element_at 0 0 li0))
+(set! li0 (add_element_at 1 1 li0))
+(set! li0 (add_element_at 2 2 li0))
+(set! li0 (add_element_at 0 -1 li0))
+(set! li0 (add_element_at 0 -3 li0))
+(set! li0 (add_element_at 1 -2 li0))
+(set! li0 (add_element_at 44 3 li0))
+(set! li0 (add_element_at -44 -4 li0))
 
 (add_element_at! 0 0 li1)
 (add_element_at! 1 1 li1)
@@ -25,17 +25,17 @@
 (add_element_at! 44 3 li1)
 (add_element_at! -44 -4 li1)
 
-(assert (= (var li0) (var li1)) [FAILED] (var test_name) equality.)
+(assert! (= (var li0) (var li1)) [FAILED] (var test_name) equality.)
 
-(assert (= (var li0.0) (var li1.0) -4) [FAILED] (var test_name) at 0: (var li0.0), (var li1.0).)
-(assert (= (var li0.1) (var li1.1) -3) [FAILED] (var test_name) at 1: (var li0.1), (var li1.1).)
-(assert (= (var li0.2) (var li1.2) -2) [FAILED] (var test_name) at 2: (var li0.2), (var li1.2).)
-(assert (= (var li0.3) (var li1.3) -1) [FAILED] (var test_name) at 3: (var li0.3), (var li1.3).)
-(assert (= (var li0.4) (var li1.4) 0) [FAILED] (var test_name) at 4: (var li0.4), (var li1.4).)
-(assert (= (var li0.5) (var li1.5) 1) [FAILED] (var test_name) at 5: (var li0.5), (var li1.5).)
-(assert (= (var li0.6) (var li1.6) 2) [FAILED] (var test_name) at 6: (var li0.6), (var li1.6).)
-(assert (= (var li0.7) (var li1.7) 3) [FAILED] (var test_name) at 7: (var li0.7), (var li1.7).)
+(assert! (= (var li0.0) (var li1.0) -4) [FAILED] (var test_name) at 0: (var li0.0), (var li1.0).)
+(assert! (= (var li0.1) (var li1.1) -3) [FAILED] (var test_name) at 1: (var li0.1), (var li1.1).)
+(assert! (= (var li0.2) (var li1.2) -2) [FAILED] (var test_name) at 2: (var li0.2), (var li1.2).)
+(assert! (= (var li0.3) (var li1.3) -1) [FAILED] (var test_name) at 3: (var li0.3), (var li1.3).)
+(assert! (= (var li0.4) (var li1.4) 0) [FAILED] (var test_name) at 4: (var li0.4), (var li1.4).)
+(assert! (= (var li0.5) (var li1.5) 1) [FAILED] (var test_name) at 5: (var li0.5), (var li1.5).)
+(assert! (= (var li0.6) (var li1.6) 2) [FAILED] (var test_name) at 6: (var li0.6), (var li1.6).)
+(assert! (= (var li0.7) (var li1.7) 3) [FAILED] (var test_name) at 7: (var li0.7), (var li1.7).)
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/add_elements_of.fate b/data/unit-testing/add_elements_of.fate
index 1fead8a..fb47a38 100644
--- a/data/unit-testing/add_elements_of.fate
+++ b/data/unit-testing/add_elements_of.fate
@@ -2,12 +2,12 @@
 
 (global string test_name)
 
-(set test_name ( ADD ELEMENTS OF ))
+(set! test_name ( ADD ELEMENTS OF ))
 
 (global (list int) li0)
 (global (list int) li1)
 
-(set li0
+(set! li0
    (add_all (range 8 10 1)
       (add_all (range 4 7 1)
          (add_all (range 0 3 1)
@@ -21,16 +21,16 @@
 (add_all! (range 4 7 1) (at (ptr li1)))
 (add_all! (range 8 10 1) li1)
 
-(assert (= (var li0) (var li1)) [FAILED] (var test_name) equality.)
+(assert! (= (var li0) (var li1)) [FAILED] (var test_name) equality.)
 
-(assert (= (var li0.0) (var li1.0) 0) [FAILED] (var test_name) at 0: (var li0.1), (var li1.0).)
-(assert (= (var li0.1) (var li1.1) 1) [FAILED] (var test_name) at 1: (var li0.1), (var li1.1).)
-(assert (= (var li0.2) (var li1.2) 2) [FAILED] (var test_name) at 2: (var li0.2), (var li1.2).)
-(assert (= (var li0.3) (var li1.3) 3) [FAILED] (var test_name) at 3: (var li0.3), (var li1.3).)
-(assert (= (var li0.4) (var li1.4) 4) [FAILED] (var test_name) at 4: (var li0.4), (var li1.4).)
-(assert (= (var li0.5) (var li1.5) 5) [FAILED] (var test_name) at 5: (var li0.5), (var li1.5).)
-(assert (= (var li0.6) (var li1.6) 6) [FAILED] (var test_name) at 6: (var li0.6), (var li1.6).)
-(assert (= (var li0.7) (var li1.7) 7) [FAILED] (var test_name) at 7: (var li0.7), (var li1.7).)
+(assert! (= (var li0.0) (var li1.0) 0) [FAILED] (var test_name) at 0: (var li0.1), (var li1.0).)
+(assert! (= (var li0.1) (var li1.1) 1) [FAILED] (var test_name) at 1: (var li0.1), (var li1.1).)
+(assert! (= (var li0.2) (var li1.2) 2) [FAILED] (var test_name) at 2: (var li0.2), (var li1.2).)
+(assert! (= (var li0.3) (var li1.3) 3) [FAILED] (var test_name) at 3: (var li0.3), (var li1.3).)
+(assert! (= (var li0.4) (var li1.4) 4) [FAILED] (var test_name) at 4: (var li0.4), (var li1.4).)
+(assert! (= (var li0.5) (var li1.5) 5) [FAILED] (var test_name) at 5: (var li0.5), (var li1.5).)
+(assert! (= (var li0.6) (var li1.6) 6) [FAILED] (var test_name) at 6: (var li0.6), (var li1.6).)
+(assert! (= (var li0.7) (var li1.7) 7) [FAILED] (var test_name) at 7: (var li0.7), (var li1.7).)
 
 (add_all! (range 11 20 1) li0)
 (add_all! (range 11 20 1) li1)
@@ -38,7 +38,7 @@
 (global (set int) si0)
 (global (set int) si1)
 
-(set si0
+(set! si0
    (add_all (range 0 10 2)
       (add_all (range 11 20 2)
          (add_all (range 1 10 2)
@@ -55,8 +55,8 @@
 (add_all! (range 1 10 2) si1)
 (add_all! (range 12 20 2) si1)
 
-(assert (= (var li0) (var li1) (var si0) (var si1)) [FAILED] (var test_name) equality 2.)
+(assert! (= (var li0) (var li1) (var si0) (var si1)) [FAILED] (var test_name) equality 2.)
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/allocate_and_free.fate b/data/unit-testing/allocate_and_free.fate
index 56c7d6b..cf05414 100644
--- a/data/unit-testing/allocate_and_free.fate
+++ b/data/unit-testing/allocate_and_free.fate
@@ -1,15 +1,16 @@
 (fate_version 1)
 
 (local (ptr int) p0)
-(allocate p0)
-(set (at p0) 72)
 
-(assert (= (at p0) 72)
+(allocate! p0)
+(set! (at p0) 72)
+
+(assert! (= (at p0) 72)
    [FAILED] Test 0
 )
 
-(free (at p0))
+(free! (at p0))
 
 [COMPLETED]
 
-(end)
+(end!)
diff --git a/data/unit-testing/cast.fate b/data/unit-testing/cast.fate
index 94b8beb..519220f 100644
--- a/data/unit-testing/cast.fate
+++ b/data/unit-testing/cast.fate
@@ -2,32 +2,32 @@
 
 (global string test_name)
 
-(set test_name ( CAST ))
+(set! test_name ( CAST ))
 
 (global int i)
 (global float f)
 (global string s)
 
-(set i (cast int ( 42 )))
+(set! i (cast int ( 42 )))
 
-(assert (= (var i) 42) [FAILED] (var test_name) equality 1: (var i).)
+(assert! (= (var i) 42) [FAILED] (var test_name) equality 1: (var i).)
 
-(set f (cast float ( 42.57 )))
+(set! f (cast float ( 42.57 )))
 
-(assert (= (var f) 42.57) [FAILED] (var test_name) equality 2: (var f).)
+(assert! (= (var f) 42.57) [FAILED] (var test_name) equality 2: (var f).)
 
-(assert (= (var i) 42 (cast int (var f))) [FAILED] (var test_name) equality 3: (cast int (var f)).)
+(assert! (= (var i) 42 (cast int (var f))) [FAILED] (var test_name) equality 3: (cast int (var f)).)
 
 
 ;; TO INT
-(assert (= 42 (cast int 42.72)) [FAILED] (var test_name) float->int: (cast int 42.72).)
-(assert (= 42 (cast int (+ 40.70 2.02))) [FAILED] (var test_name) extra float->int: (cast int (+ 40.70 2.02)).)
-(assert (= 42 (cast int 42)) [FAILED] (var test_name) int->int: (cast int 42).)
-(assert (= 42 (cast int (+ 40 2))) [FAILED] (var test_name) extra int->int: (cast int (+ 40 2)).)
-(assert (= 42 (cast int ( 42 ))) [FAILED] (var test_name) string->int: (cast int ( 42 )).)
+(assert! (= 42 (cast int 42.72)) [FAILED] (var test_name) float->int: (cast int 42.72).)
+(assert! (= 42 (cast int (+ 40.70 2.02))) [FAILED] (var test_name) extra float->int: (cast int (+ 40.70 2.02)).)
+(assert! (= 42 (cast int 42)) [FAILED] (var test_name) int->int: (cast int 42).)
+(assert! (= 42 (cast int (+ 40 2))) [FAILED] (var test_name) extra int->int: (cast int (+ 40 2)).)
+(assert! (= 42 (cast int ( 42 ))) [FAILED] (var test_name) string->int: (cast int ( 42 )).)
 
 ;; TO FLOAT
-(assert
+(assert!
    (>
       0.05
       (abs
@@ -39,7 +39,7 @@
    )
    [FAILED] (var test_name) float->float: (cast float 42.72).
 )
-(assert
+(assert!
    (> 0.05
       (abs
          (-
@@ -50,9 +50,9 @@
    )
    [FAILED] (var test_name) extra float->float: (cast float (+ 40.70 2.02)).
 )
-(assert (= 42.0 (cast float 42)) [FAILED] (var test_name) int->float: (cast float 42).)
-(assert (= 42.0 (cast float (+ 40 2))) [FAILED] (var test_name) extra float->float: (cast float (+ 40 2)).)
-(assert
+(assert! (= 42.0 (cast float 42)) [FAILED] (var test_name) int->float: (cast float 42).)
+(assert! (= 42.0 (cast float (+ 40 2))) [FAILED] (var test_name) extra float->float: (cast float (+ 40 2)).)
+(assert!
    (> 0.05
       (abs
          (-
@@ -65,14 +65,14 @@
 )
 
 ;; TO BOOL
-(assert (= (true) (cast bool (true))) [FAILED] (var test_name) bool->bool: (cast bool (true)).)
-(assert (= (true) (cast bool (or (true) (false)))) [FAILED] (var test_name) extra bool->bool: (cast bool (or (true) (false))).)
-(assert (= (true) (cast bool ( true ))) [FAILED] (var test_name) string->bool: (cast bool ( true )).)
+(assert! (= (true) (cast bool (true))) [FAILED] (var test_name) bool->bool: (cast bool (true)).)
+(assert! (= (true) (cast bool (or (true) (false)))) [FAILED] (var test_name) extra bool->bool: (cast bool (or (true) (false))).)
+(assert! (= (true) (cast bool ( true ))) [FAILED] (var test_name) string->bool: (cast bool ( true )).)
 
 ;; TO STRING
-(assert (= ( 42 ) (cast string 42)) [FAILED] (var test_name) int->string: (cast string 42).)
-(assert (= ( 42 ) (cast string (+ 40 2))) [FAILED] (var test_name) extra int->string: (cast string (+ 40 2)).)
-(assert
+(assert! (= ( 42 ) (cast string 42)) [FAILED] (var test_name) int->string: (cast string 42).)
+(assert! (= ( 42 ) (cast string (+ 40 2))) [FAILED] (var test_name) extra int->string: (cast string (+ 40 2)).)
+(assert!
    (> 0.05
       (abs
          (-
@@ -83,7 +83,7 @@
    )
    [FAILED] (var test_name) float->string: (cast string 42.72).
 )
-(assert
+(assert!
    (> 0.05
       (abs
          (-
@@ -94,10 +94,10 @@
    )
    [FAILED] (var test_name) extra float->string: (cast string (+ 40.7 2.02)).
 )
-(assert (= ( true ) (cast string (true))) [FAILED] (var test_name) bool->string: (cast string (true)).)
-(assert (= ( true ) (cast string (or (true) (false)))) [FAILED] (var test_name) extra bool->string: (cast string (true)).)
-(assert (= ( something ) (cast string ( something ))) [FAILED] (var test_name) string->string: (cast string ( something )).)
+(assert! (= ( true ) (cast string (true))) [FAILED] (var test_name) bool->string: (cast string (true)).)
+(assert! (= ( true ) (cast string (or (true) (false)))) [FAILED] (var test_name) extra bool->string: (cast string (true)).)
+(assert! (= ( something ) (cast string ( something ))) [FAILED] (var test_name) string->string: (cast string ( something )).)
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/cond.fate b/data/unit-testing/cond.fate
index 0eae815..1e73c8f 100644
--- a/data/unit-testing/cond.fate
+++ b/data/unit-testing/cond.fate
@@ -2,7 +2,7 @@
 
 (global string test_name)
 
-(set test_name ( COND ))
+(set! test_name ( COND ))
 
 (global bool test)
 
@@ -11,138 +11,138 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (cond
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 0.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 0.)
    )
 )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(set test (false))
+(set! test (false))
 
 (cond
    ((true)
-      (set test (true))
+      (set! test (true))
    )
 )
 
-(assert test [FAILED] (var test_name) Ignored correct branch 0.)
+(assert! test [FAILED] (var test_name) Ignored correct branch 0.)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(set test (false))
+(set! test (false))
 
 (cond
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 1.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 1.)
    )
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 2.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 2.)
    )
    ((true)
-      (set test (true))
+      (set! test (true))
    )
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 3.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 3.)
    )
 )
 
-(assert test [FAILED] (var test_name) Ignored correct branch 1.)
+(assert! test [FAILED] (var test_name) Ignored correct branch 1.)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(set test (false))
+(set! test (false))
 
 (cond
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 4.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 4.)
    )
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 5.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 5.)
    )
    ((true)
-      (set test (true))
+      (set! test (true))
    )
    ((true)
-      (assert (false) [FAILED] (var test_name) Reached dead code 6.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 6.)
    )
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 7.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 7.)
    )
 )
 
-(assert test [FAILED] (var test_name) Ignored correct branch 2.)
+(assert! test [FAILED] (var test_name) Ignored correct branch 2.)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(set test (false))
+(set! test (false))
 
 (cond
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 8.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 8.)
    )
    ((false)
-      (assert (false) [FAILED] (var test_name) Reached dead code 9.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 9.)
    )
    ((true)
-      (set test (true))
+      (set! test (true))
    )
    ((true)
-      (assert (false) [FAILED] (var test_name) Reached dead code 10.)
+      (assert! (false) [FAILED] (var test_name) Reached dead code 10.)
    )
 )
 
-(assert test [FAILED] (var test_name) Ignored correct branch 3.)
+(assert! test [FAILED] (var test_name) Ignored correct branch 3.)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(set test (false))
+(set! test (false))
 
 (cond
    ((false)
       (cond
          ((true)
-            (assert (false) [FAILED] (var test_name) Reached dead code 11.)
+            (assert! (false) [FAILED] (var test_name) Reached dead code 11.)
          )
       )
    )
    ((false)
       (cond
          ((true)
-            (assert (false) [FAILED] (var test_name) Reached dead code 12.)
+            (assert! (false) [FAILED] (var test_name) Reached dead code 12.)
          )
       )
    )
    ((true)
       (cond
          ((true)
-            (set test (true))
+            (set! test (true))
          )
          ((false)
-            (assert (false) [FAILED] (var test_name) Reached dead code 13.)
+            (assert! (false) [FAILED] (var test_name) Reached dead code 13.)
          )
       )
    )
    ((true)
       (cond
          ((true)
-            (assert (false) [FAILED] (var test_name) Reached dead code 14.)
+            (assert! (false) [FAILED] (var test_name) Reached dead code 14.)
          )
       )
    )
 )
 
-(assert test [FAILED] (var test_name) Ignored correct branch 4.)
+(assert! test [FAILED] (var test_name) Ignored correct branch 4.)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; COMPUTATION ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(assert
+(assert!
    (cond ((false) (true)))
    [FAILED] (var test_name) Questionable default value.
 )
 
-(assert
+(assert!
    (cond ((true) (true)))
    [FAILED] (var test_name) Simple computation test 0.
 )
 
-(assert
+(assert!
    (cond
       ((false) (true))
       ((true) (true))
@@ -150,7 +150,7 @@
    [FAILED] (var test_name) Simple computation test 1.
 )
 
-(assert
+(assert!
    (cond
       ((true) (true))
       ((false) (true))
@@ -158,7 +158,7 @@
    [FAILED] (var test_name) Simple computation test 2.
 )
 
-(assert
+(assert!
    (cond
       (
          (cond
@@ -176,4 +176,4 @@
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/cons_car_cdr.fate b/data/unit-testing/cons_car_cdr.fate
index 7187f6a..a555cc0 100644
--- a/data/unit-testing/cons_car_cdr.fate
+++ b/data/unit-testing/cons_car_cdr.fate
@@ -2,33 +2,33 @@
 
 (global string test_name)
 
-(set test_name ( CONS CAR CDR ))
+(set! test_name ( CONS CAR CDR ))
 
-(assert (= (car (cons 1 (cons 2 (cons 3 (cons 4 5))))) 1)
+(assert! (= (car (cons 1 (cons 2 (cons 3 (cons 4 5))))) 1)
    [FAILED] (var test_name) test 1: (car (cons 1 (cons 2 (cons 3 (cons 4 5))))).
 )
 
-(assert (= (car (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))) 2)
+(assert! (= (car (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))) 2)
    [FAILED] (var test_name) test 2:
    (car (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))).
 )
 
-(assert (= (car (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5))))))) 3)
+(assert! (= (car (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5))))))) 3)
    [FAILED] (var test_name) test 3:
    (car (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5))))))).
 )
 
-(assert (= (car (cdr (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))))) 4)
+(assert! (= (car (cdr (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))))) 4)
    [FAILED] (var test_name) test 4:
    (car (cdr (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))))).
 )
 
-(assert (= (cdr (cdr (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))))) 5)
+(assert! (= (cdr (cdr (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))))) 5)
    [FAILED] (var test_name) test 5:
    (cdr (cdr (cdr (cdr (cons 1 (cons 2 (cons 3 (cons 4 5)))))))).
 )
 
-(assert (= (car (cons test 0)) test)
+(assert! (= (car (cons test 0)) test)
    [FAILED] (var test_name) test string:
    (car (cons test 0))
 )
@@ -36,16 +36,16 @@
 (global (cons float string) cfs)
 (global (cons float string) cfs2)
 
-(set cfs (cons 3.14 pi))
+(set! cfs (cons 3.14 pi))
 
-(assert (= (car cfs) 3.14) [FAILED] (var test_name) test 3.14: (car cfs).)
-(assert (= (cdr cfs) pi) [FAILED] (var test_name) test pi: (cdr cfs).)
+(assert! (= (car cfs) 3.14) [FAILED] (var test_name) test 3.14: (car cfs).)
+(assert! (= (cdr cfs) pi) [FAILED] (var test_name) test pi: (cdr cfs).)
 
 
-(set cfs2 (cons (car cfs) (cdr cfs)))
+(set! cfs2 (cons (car cfs) (cdr cfs)))
 
-(assert (= (var cfs2) (var cfs)) [FAILED] (var test_name) equality.)
+(assert! (= (var cfs2) (var cfs)) [FAILED] (var test_name) equality.)
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/count.fate b/data/unit-testing/count.fate
index 99fed3d..2c54998 100644
--- a/data/unit-testing/count.fate
+++ b/data/unit-testing/count.fate
@@ -2,9 +2,9 @@
 
 (global string test_name)
 
-(set test_name ( COUNT ))
+(set! test_name ( COUNT ))
 
-(assert (= (count 10 (range 0 60 1)) 1)
+(assert! (= (count 10 (range 0 60 1)) 1)
    [FAILED] (var test_name) Failed to find 10 in range 0 60 1.
 )
 
@@ -15,7 +15,7 @@
 (add_all! (range 0 10 1) li)
 (add_all! (range 0 10 1) li)
 
-(assert (= (count 10 li) 4)
+(assert! (= (count 10 li) 4)
    [FAILED] (var test_name) Failed to find 10 four times in li.
 )
 
@@ -26,7 +26,7 @@
 (add_all! (range 0 10 1) si)
 (add_all! (range 0 10 1) si)
 
-(assert (= (count 10 si) 1)
+(assert! (= (count 10 si) 1)
    [FAILED] (var test_name) Failed to find 10 exactly once in si.
 )
 
@@ -37,7 +37,7 @@
 (add! test2 ls)
 (add! test3 ls)
 
-(assert (= (count test0 ls) 1)
+(assert! (= (count test0 ls) 1)
    [FAILED] (var test_name) Failed to find test0 exactly once in ls.
 )
 
@@ -54,25 +54,25 @@
 (add! test2 ls)
 (add! test3 ls)
 
-(assert (= (count test0 ls) 4)
+(assert! (= (count test0 ls) 4)
    [FAILED] (var test_name) Failed to find test0 four times in ls.
 )
 
 (global (list bool) lb)
 (local int i)
 
-(for (set i 0) (=< i 10) (set i (+ i 1))
+(for (set! i 0) (=< i 10) (set! i (+ i 1))
    (add! (= (mod i 2) 0) lb)
 )
 
-(assert (= (count (true) lb) 6)
+(assert! (= (count (true) lb) 6)
    [FAILED] (var test_name) Failed to find six even numbers.
 )
 
-(assert (= (count (false) lb) 5)
+(assert! (= (count (false) lb) 5)
    [FAILED] (var test_name) Failed to find four odd numbers.
 )
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/field_access.fate b/data/unit-testing/field_access.fate
index 715e706..eaedc3a 100644
--- a/data/unit-testing/field_access.fate
+++ b/data/unit-testing/field_access.fate
@@ -2,7 +2,7 @@
 
 (global string test_name)
 
-(set test_name ( FIELD ACCESS ))
+(set! test_name ( FIELD ACCESS ))
 
 (declare_structure test_struct_type0
    (int i)
@@ -59,7 +59,7 @@
    (lts (add (var ts0_0) (add (var ts0_1) (default (list test_struct_type0)))))
 )
 
-(set ts2_0
+(set! ts2_0
    (set_fields (default test_struct_type2)
       (i -1337)
       (ts0 (var ts0_0))
@@ -67,7 +67,7 @@
    )
 )
 
-(assert
+(assert!
    (= (get_field i ts0_0) (var ts0_0.i) (get_field k ts0_1) (var ts0_1.k) 42)
    [FAILED] (var test_name) Test 0.
    (newline)
@@ -76,7 +76,7 @@
    ts0_1.k = (var ts0_1.k)
 )
 
-(assert
+(assert!
    (= (get_field i ts0_1) (var ts0_1.i) (get_field k ts0_0) (var ts0_0.k) 420)
    [FAILED] (var test_name) Test 1.
    (newline)
@@ -85,7 +85,7 @@
    ts0_1.i = (var ts0_1.i)
 )
 
-(assert
+(assert!
    (=
       (field i ts0_1)
       (get_field i (set_fields ts1_0 (i 420)))
@@ -97,4 +97,4 @@
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/filter.fate b/data/unit-testing/filter.fate
index 8d85ee3..7fc1ea8 100644
--- a/data/unit-testing/filter.fate
+++ b/data/unit-testing/filter.fate
@@ -2,15 +2,15 @@
 
 (global string test_name)
 
-(set test_name ( FILTER ))
+(set! test_name ( FILTER ))
 
 (global (list int) 0to10)
 (global (list int) 0to10odd)
 (global (list int) 0to10even)
 
-(set 0to10 (range 0 10 1))
+(set! 0to10 (range 0 10 1))
 
-(set 0to10odd
+(set! 0to10odd
    (filter
       (lambda ((int i) (int two) (int one)) (= (mod i two) (var one)))
       0to10
@@ -21,62 +21,62 @@
 
 (local (lambda bool (int)) filter_fun)
 
-(set filter_fun (lambda ((int i)) (= (mod i 2) 0)))
-(set 0to10even
+(set! filter_fun (lambda ((int i)) (= (mod i 2) 0)))
+(set! 0to10even
    (filter filter_fun 0to10)
 )
 
-(assert
+(assert!
    (= 0 (var 0to10even.0))
    [FAILED] (var test_name) Failed 0to10even.0: (var 0to10even.0).
 )
 
-(assert
+(assert!
    (= 1 (var 0to10odd.0))
    [FAILED] (var test_name) Failed 0to10odd.0: (var 0to10odd.0).
 )
 
-(assert
+(assert!
    (= 2 (var 0to10even.1))
    [FAILED] (var test_name) Failed 0to10even.1: (var 0to10even.1).
 )
 
-(assert
+(assert!
    (= 3 (var 0to10odd.1))
    [FAILED] (var test_name) Failed 0to10odd.1: (var 0to10odd.1).
 )
 
-(assert
+(assert!
    (= 4 (var 0to10even.2))
    [FAILED] (var test_name) Failed 0to10even.2: (var 0to10even.2).
 )
 
-(assert
+(assert!
    (= 5 (var 0to10odd.2))
    [FAILED] (var test_name) Failed 0to10odd.2: (var 0to10odd.2).
 )
 
-(assert
+(assert!
    (= 6 (var 0to10even.3))
    [FAILED] (var test_name) Failed 0to10even.3: (var 0to10even.3).
 )
 
-(assert
+(assert!
    (= 7 (var 0to10odd.3))
    [FAILED] (var test_name) Failed 0to10odd.3: (var 0to10odd.3).
 )
 
-(assert
+(assert!
    (= 8 (var 0to10even.4))
    [FAILED] (var test_name) Failed 0to10even.4: (var 0to10even.4).
 )
 
-(assert
+(assert!
    (= 9 (var 0to10odd.4))
    [FAILED] (var test_name) Failed 0to10odd.4: (var 0to10odd.4).
 )
 
-(assert
+(assert!
    (= 10 (var 0to10even.5))
    [FAILED] (var test_name) Failed 0to10even.5: (var 0to10even.5).
 )
@@ -84,8 +84,8 @@
 (global (list int) 0to10odd2)
 (global (list int) 0to10even2)
 
-(set 0to10odd2 (var 0to10))
-(set 0to10even2 (var 0to10))
+(set! 0to10odd2 (var 0to10))
+(set! 0to10even2 (var 0to10))
 
 (filter!
    (lambda ((int i) (int two) (int one)) (= (mod i two) (var one)))
@@ -96,62 +96,62 @@
 
 (filter! filter_fun 0to10even2)
 
-(assert
+(assert!
    (= 0 (var 0to10even2.0))
    [FAILED] (var test_name) Failed 0to10even2.0: (var 0to10even2.0).
 )
 
-(assert
+(assert!
    (= 1 (var 0to10odd2.0))
    [FAILED] (var test_name) Failed 0to10odd2.0: (var 0to10odd2.0).
 )
 
-(assert
+(assert!
    (= 2 (var 0to10even2.1))
    [FAILED] (var test_name) Failed 0to10even2.1: (var 0to10even2.1).
 )
 
-(assert
+(assert!
    (= 3 (var 0to10odd2.1))
    [FAILED] (var test_name) Failed 0to10odd2.1: (var 0to10odd2.1).
 )
 
-(assert
+(assert!
    (= 4 (var 0to10even2.2))
    [FAILED] (var test_name) Failed 0to10even2.2: (var 0to10even2.2).
 )
 
-(assert
+(assert!
    (= 5 (var 0to10odd2.2))
    [FAILED] (var test_name) Failed 0to10odd2.2: (var 0to10odd2.2).
 )
 
-(assert
+(assert!
    (= 6 (var 0to10even2.3))
    [FAILED] (var test_name) Failed 0to10even2.3: (var 0to10even2.3).
 )
 
-(assert
+(assert!
    (= 7 (var 0to10odd2.3))
    [FAILED] (var test_name) Failed 0to10odd2.3: (var 0to10odd2.3).
 )
 
-(assert
+(assert!
    (= 8 (var 0to10even2.4))
    [FAILED] (var test_name) Failed 0to10even2.4: (var 0to10even2.4).
 )
 
-(assert
+(assert!
    (= 9 (var 0to10odd2.4))
    [FAILED] (var test_name) Failed 0to10odd2.4: (var 0to10odd2.4).
 )
 
-(assert
+(assert!
    (= 10 (var 0to10even2.5))
    [FAILED] (var test_name) Failed 0to10even2.5: (var 0to10even2.5).
 )
 
-(set 0to10odd
+(set! 0to10odd
    (indexed_filter
       (lambda ((int ix) (int i) (int two) (int one)) (= (mod i two) (var one)))
       0to10
@@ -162,66 +162,66 @@
 
 (local (lambda bool (int int)) indexed_filter_fun)
 
-(set indexed_filter_fun (lambda ((int ix) (int i)) (= (mod i 2) 0)))
-(set 0to10even (indexed_filter indexed_filter_fun 0to10))
+(set! indexed_filter_fun (lambda ((int ix) (int i)) (= (mod i 2) 0)))
+(set! 0to10even (indexed_filter indexed_filter_fun 0to10))
 
-(assert
+(assert!
    (= 0 (var 0to10even.0))
    [FAILED] (var test_name) Failed indexed 0to10even.0: (var 0to10even.0).
 )
 
-(assert
+(assert!
    (= 1 (var 0to10odd.0))
    [FAILED] (var test_name) Failed indexed 0to10odd.0: (var 0to10odd.0).
 )
 
-(assert
+(assert!
    (= 2 (var 0to10even.1))
    [FAILED] (var test_name) Failed indexed 0to10even.1: (var 0to10even.1).
 )
 
-(assert
+(assert!
    (= 3 (var 0to10odd.1))
    [FAILED] (var test_name) Failed indexed 0to10odd.1: (var 0to10odd.1).
 )
 
-(assert
+(assert!
    (= 4 (var 0to10even.2))
    [FAILED] (var test_name) Failed indexed 0to10even.2: (var 0to10even.2).
 )
 
-(assert
+(assert!
    (= 5 (var 0to10odd.2))
    [FAILED] (var test_name) Failed indexed 0to10odd.2: (var 0to10odd.2).
 )
 
-(assert
+(assert!
    (= 6 (var 0to10even.3))
    [FAILED] (var test_name) Failed indexed 0to10even.3: (var 0to10even.3).
 )
 
-(assert
+(assert!
    (= 7 (var 0to10odd.3))
    [FAILED] (var test_name) Failed indexed 0to10odd.3: (var 0to10odd.3).
 )
 
-(assert
+(assert!
    (= 8 (var 0to10even.4))
    [FAILED] (var test_name) Failed indexed 0to10even.4: (var 0to10even.4).
 )
 
-(assert
+(assert!
    (= 9 (var 0to10odd.4))
    [FAILED] (var test_name) Failed indexed 0to10odd.4: (var 0to10odd.4).
 )
 
-(assert
+(assert!
    (= 10 (var 0to10even.5))
    [FAILED] (var test_name) Failed indexed 0to10even.5: (var 0to10even.5).
 )
 
-(set 0to10odd2 (var 0to10))
-(set 0to10even2 (var 0to10))
+(set! 0to10odd2 (var 0to10))
+(set! 0to10even2 (var 0to10))
 
 (indexed_filter!
    (lambda ((int ix) (int i) (int two) (int one)) (= (mod i two) (var one)))
@@ -232,57 +232,57 @@
 
 (indexed_filter! indexed_filter_fun 0to10even2)
 
-(assert
+(assert!
    (= 0 (var 0to10even2.0))
    [FAILED] (var test_name) Failed indexed 0to10even2.0: (var 0to10even2.0).
 )
 
-(assert
+(assert!
    (= 1 (var 0to10odd2.0))
    [FAILED] (var test_name) Failed indexed 0to10odd2.0: (var 0to10odd2.0).
 )
 
-(assert
+(assert!
    (= 2 (var 0to10even2.1))
    [FAILED] (var test_name) Failed indexed 0to10even2.1: (var 0to10even2.1).
 )
 
-(assert
+(assert!
    (= 3 (var 0to10odd2.1))
    [FAILED] (var test_name) Failed indexed 0to10odd2.1: (var 0to10odd2.1).
 )
 
-(assert
+(assert!
    (= 4 (var 0to10even2.2))
    [FAILED] (var test_name) Failed indexed 0to10even2.2: (var 0to10even2.2).
 )
 
-(assert
+(assert!
    (= 5 (var 0to10odd2.2))
    [FAILED] (var test_name) Failed indexed 0to10odd2.2: (var 0to10odd2.2).
 )
 
-(assert
+(assert!
    (= 6 (var 0to10even2.3))
    [FAILED] (var test_name) Failed indexed 0to10even2.3: (var 0to10even2.3).
 )
 
-(assert
+(assert!
    (= 7 (var 0to10odd2.3))
    [FAILED] (var test_name) Failed indexed 0to10odd2.3: (var 0to10odd2.3).
 )
 
-(assert
+(assert!
    (= 8 (var 0to10even2.4))
    [FAILED] (var test_name) Failed indexed 0to10even2.4: (var 0to10even2.4).
 )
 
-(assert
+(assert!
    (= 9 (var 0to10odd2.4))
    [FAILED] (var test_name) Failed indexed 0to10odd2.4: (var 0to10odd2.4).
 )
 
-(assert
+(assert!
    (= 10 (var 0to10even2.5))
    [FAILED] (var test_name) Failed indexed 0to10even2.5: (var 0to10even2.5).
 )
@@ -290,10 +290,10 @@
 (global (list int) oli0)
 (global (list int) oli1)
 
-(set oli0 (range -10 10 1))
-(set oli1 (var oli0))
+(set! oli0 (range -10 10 1))
+(set! oli1 (var oli0))
 
-(set oli0
+(set! oli0
    (indexed_filter
       (lambda ((int ix) (int i))
          (exactly_one
@@ -316,56 +316,56 @@
    (range 1 21 2)
 )
 
-(assert
+(assert!
    (= -9 (var oli0.0) (var oli1.0))
    [FAILED] (var test_name) Failed indexed filter -9: (var oli0.0), (var oli1.0)
 )
 
-(assert
+(assert!
    (= -7 (var oli0.1) (var oli1.1))
    [FAILED] (var test_name) Failed indexed filter -7: (var oli0.1), (var oli1.1)
 )
 
-(assert
+(assert!
    (= -5 (var oli0.2) (var oli1.2))
    [FAILED] (var test_name) Failed indexed filter -5: (var oli0.2), (var oli1.2)
 )
 
-(assert
+(assert!
    (= -3 (var oli0.3) (var oli1.3))
    [FAILED] (var test_name) Failed indexed filter -3: (var oli0.3), (var oli1.3)
 )
 
-(assert
+(assert!
    (= -1 (var oli0.4) (var oli1.4))
    [FAILED] (var test_name) Failed indexed filter -1: (var oli0.4), (var oli1.4)
 )
 
-(assert
+(assert!
    (= 2 (var oli0.5) (var oli1.5))
    [FAILED] (var test_name) Failed indexed filter 2: (var oli0.5), (var oli1.5)
 )
 
-(assert
+(assert!
    (= 4 (var oli0.6) (var oli1.6))
    [FAILED] (var test_name) Failed indexed filter 4: (var oli0.6), (var oli1.6)
 )
 
-(assert
+(assert!
    (= 6 (var oli0.7) (var oli1.7))
    [FAILED] (var test_name) Failed indexed filter 6: (var oli0.7), (var oli1.7)
 )
 
-(assert
+(assert!
    (= 8 (var oli0.8) (var oli1.8))
    [FAILED] (var test_name) Failed indexed filter 8: (var oli0.8), (var oli1.8)
 )
 
-(assert
+(assert!
    (= 10 (var oli0.9) (var oli1.9))
    [FAILED] (var test_name) Failed indexed filter 9: (var oli0.9), (var oli1.9)
 )
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/fold.fate b/data/unit-testing/fold.fate
index f064714..662ec3c 100644
--- a/data/unit-testing/fold.fate
+++ b/data/unit-testing/fold.fate
@@ -2,13 +2,13 @@
 
 (global string test_name)
 
-(set test_name ( FOLD ))
+(set! test_name ( FOLD ))
 
 (global (list int) 0to10)
 
-(set 0to10 (range 0 10 1))
+(set! 0to10 (range 0 10 1))
 
-(assert
+(assert!
    (= 55
       (foldl
          (lambda ((int res) (int e)) (+ res e))
@@ -41,7 +41,7 @@
 (global (list int) 10to0_0)
 (global (list int) 10to0_1)
 
-(set 10to0_0
+(set! 10to0_0
    (foldr
       (lambda (((list int) res) (int e))
          (add (- e 10) res)
@@ -51,7 +51,7 @@
    )
 )
 
-(set 10to0_1
+(set! 10to0_1
    (foldr
       (lambda (((list int) res) (int e) (int mod))
          (add (- e mod) res)
@@ -62,67 +62,67 @@
    )
 )
 
-(assert
+(assert!
    (= 10 (var 10to0_0.0) (var 10to0_1.0))
    [FAILED] (var test_name) 10to0.0:(newline)
    (var 10to0_0.0), (var 10to0_1.0)
 )
 
-(assert
+(assert!
    (= 9 (var 10to0_0.1) (var 10to0_1.1))
    [FAILED] (var test_name) 10to0.1:(newline)
    (var 10to0_0.1), (var 10to0_1.1)
 )
 
-(assert
+(assert!
    (= 8 (var 10to0_0.2) (var 10to0_1.2))
    [FAILED] (var test_name) 10to0.2:(newline)
    (var 10to0_0.2), (var 10to0_1.2)
 )
 
-(assert
+(assert!
    (= 7 (var 10to0_0.3) (var 10to0_1.3))
    [FAILED] (var test_name) 10to0.3:(newline)
    (var 10to0_0.3), (var 10to0_1.3)
 )
 
-(assert
+(assert!
    (= 6 (var 10to0_0.4) (var 10to0_1.4))
    [FAILED] (var test_name) 10to0.4:(newline)
    (var 10to0_0.4), (var 10to0_1.4)
 )
 
-(assert
+(assert!
    (= 5 (var 10to0_0.5) (var 10to0_1.5))
    [FAILED] (var test_name) 10to0.5:(newline)
    (var 10to0_0.5), (var 10to0_1.5)
 )
 
-(assert
+(assert!
    (= 4 (var 10to0_0.6) (var 10to0_1.6))
    [FAILED] (var test_name) 10to0.6:(newline)
    (var 10to0_0.6), (var 10to0_1.6)
 )
 
-(assert
+(assert!
    (= 3 (var 10to0_0.7) (var 10to0_1.7))
    [FAILED] (var test_name) 10to0.7:(newline)
    (var 10to0_0.7), (var 10to0_1.7)
 )
 
-(assert
+(assert!
    (= 2 (var 10to0_0.8) (var 10to0_1.8))
    [FAILED] (var test_name) 10to0.8:(newline)
    (var 10to0_0.8), (var 10to0_1.8)
 )
 
-(assert
+(assert!
    (= 1 (var 10to0_0.9) (var 10to0_1.9))
    [FAILED] (var test_name) 10to0.9:(newline)
    (var 10to0_0.9), (var 10to0_1.9)
 )
 
-(assert
+(assert!
    (= 0 (var 10to0_0.10) (var 10to0_1.10))
    [FAILED] (var test_name) 10to0.10:(newline)
    (var 10to0_0.10), (var 10to0_1.10)
@@ -131,7 +131,7 @@
 (global (list int) 10to20_0)
 (global (list int) 10to20_1)
 
-(set 10to20_0
+(set! 10to20_0
    (foldl
       (lambda (((list int) res) (int e))
          (add (- e 10) res)
@@ -141,7 +141,7 @@
    )
 )
 
-(set 10to20_1
+(set! 10to20_1
    (foldl
       (lambda (((list int) res) (int e) (int mod))
          (add (- e mod) res)
@@ -152,67 +152,67 @@
    )
 )
 
-(assert
+(assert!
    (= 10 (var 10to20_0.0) (var 10to20_1.0))
    [FAILED] (var test_name) 10to20.0: (newline)
    (var 10to20_0.0), (var 10to20_1.0)
 )
 
-(assert
+(assert!
    (= 11 (var 10to20_0.1) (var 10to20_1.1))
    [FAILED] (var test_name) 10to20.1: (newline)
    (var 10to20_0.1), (var 10to20_1.1)
 )
 
-(assert
+(assert!
    (= 12 (var 10to20_0.2) (var 10to20_1.2))
    [FAILED] (var test_name) 10to20.2: (newline)
    (var 10to20_0.2), (var 10to20_1.2)
 )
 
-(assert
+(assert!
    (= 13 (var 10to20_0.3) (var 10to20_1.3))
    [FAILED] (var test_name) 10to20.3: (newline)
    (var 10to20_0.3), (var 10to20_1.3)
 )
 
-(assert
+(assert!
    (= 14 (var 10to20_0.4) (var 10to20_1.4))
    [FAILED] (var test_name) 10to20.4: (newline)
    (var 10to20_0.4), (var 10to20_1.4)
 )
 
-(assert
+(assert!
    (= 15 (var 10to20_0.5) (var 10to20_1.5))
    [FAILED] (var test_name) 10to20.5: (newline)
    (var 10to20_0.5), (var 10to20_1.5)
 )
 
-(assert
+(assert!
    (= 16 (var 10to20_0.6) (var 10to20_1.6))
    [FAILED] (var test_name) 10to20.6: (newline)
    (var 10to20_0.6), (var 10to20_1.6)
 )
 
-(assert
+(assert!
    (= 17 (var 10to20_0.7) (var 10to20_1.7))
    [FAILED] (var test_name) 10to20.7: (newline)
    (var 10to20_0.7), (var 10to20_1.7)
 )
 
-(assert
+(assert!
    (= 18 (var 10to20_0.8) (var 10to20_1.8))
    [FAILED] (var test_name) 10to20.8: (newline)
    (var 10to20_0.8), (var 10to20_1.8)
 )
 
-(assert
+(assert!
    (= 19 (var 10to20_0.9) (var 10to20_1.9))
    [FAILED] (var test_name) 10to20.9: (newline)
    (var 10to20_0.9), (var 10to20_1.9)
 )
 
-(assert
+(assert!
    (= 20 (var 10to20_0.10) (var 10to20_1.10))
    [FAILED] (var test_name) 10to20.10: (newline)
    (var 10to20_0.10), (var 10to20_1.10)
@@ -220,4 +220,4 @@
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/ifelse.fate b/data/unit-testing/ifelse.fate
index e06be4d..34bc4f0 100644
--- a/data/unit-testing/ifelse.fate
+++ b/data/unit-testing/ifelse.fate
@@ -2,50 +2,50 @@
 
 (global string test_name)
 
-(set test_name ( IF ELSE ))
+(set! test_name ( IF ELSE ))
 
 
 (if (false)
-   (assert (false) [FAILED] (var test_name) Executing dead code 0.)
+   (assert! (false) [FAILED] (var test_name) Executing dead code 0.)
 )
 
 (global bool test)
 
-(set test (false))
+(set! test (false))
 
 (ifelse (false)
-   (assert (false) [FAILED] (var test_name) Executing dead code 1.)
-   (set test (true))
+   (assert! (false) [FAILED] (var test_name) Executing dead code 1.)
+   (set! test (true))
 )
 
-(assert test [FAILED] (var test_name) ignored valid branch 0.)
+(assert! test [FAILED] (var test_name) ignored valid branch 0.)
 
 (if (false)
-   (assert (false) [FAILED] (var test_name) Executing dead code 2.)
-   (set test (false))
+   (assert! (false) [FAILED] (var test_name) Executing dead code 2.)
+   (set! test (false))
 )
 
-(assert test [FAILED] (var test_name) Executing dead code 3.)
+(assert! test [FAILED] (var test_name) Executing dead code 3.)
 
-(set test
+(set! test
    (ifelse (false)
       (false)
       (true)
    )
 )
 
-(assert test [FAILED] (var test_name) Executing dead code 4.)
+(assert! test [FAILED] (var test_name) Executing dead code 4.)
 
-(set test
+(set! test
    (ifelse (true)
       (true)
       (false)
    )
 )
 
-(assert test [FAILED] (var test_name) Executing dead code 5.)
+(assert! test [FAILED] (var test_name) Executing dead code 5.)
 
-(assert
+(assert!
    (=
       (ifelse (= 8 (+ 4 4))
          ( valid string )
@@ -58,4 +58,4 @@
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/map.fate b/data/unit-testing/map.fate
index bea1ada..3d6c16c 100644
--- a/data/unit-testing/map.fate
+++ b/data/unit-testing/map.fate
@@ -2,28 +2,28 @@
 
 (global string test_name)
 
-(set test_name ( MAP ))
+(set! test_name ( MAP ))
 
 (global (list int) li0)
 (global (list int) li1)
 (global (list int) li2)
 (global (list int) li3)
 
-(set li0
+(set! li0
    (map
       (lambda ((int i)) (* i 2))
       (range 0 10 1)
    )
 )
 
-(set li1 (range 0 10 1))
+(set! li1 (range 0 10 1))
 
 (map!
    (lambda ((int i)) (* i 2))
    li1
 )
 
-(set li2
+(set! li2
    (map
       (lambda ((int i) (int mod)) (* i mod))
       (range 0 10 1)
@@ -31,7 +31,7 @@
    )
 )
 
-(set li3 (range 0 10 1))
+(set! li3 (range 0 10 1))
 
 (map!
    (lambda ((int i) (int mod)) (* i mod))
@@ -39,78 +39,78 @@
    2
 )
 
-(assert
+(assert!
    (= (var li1) (var li0) (var li2) (var li3))
    [FAILED] (var test_name) Equality test 0.
 )
 
-(assert
+(assert!
    (= 0 (var li1.0) (var li0.0))
    [FAILED] (var test_name) Test for 0: (var li1.0), (var li0.0).
 )
 
-(assert
+(assert!
    (= 2 (var li1.1) (var li0.1))
    [FAILED] (var test_name) Test for 2: (var li1.1), (var li0.1).
 )
 
-(assert
+(assert!
    (= 4 (var li1.2) (var li0.2))
    [FAILED] (var test_name) Test for 4: (var li1.2), (var li0.2).
 )
-(assert
+(assert!
    (= 6 (var li1.3) (var li0.3))
    [FAILED] (var test_name) Test for 6: (var li1.3), (var li0.3).
 )
-(assert
+(assert!
    (= 8 (var li1.4) (var li0.4))
    [FAILED] (var test_name) Test for 8: (var li1.4), (var li0.4).
 )
-(assert
+(assert!
    (= 10 (var li1.5) (var li0.5))
    [FAILED] (var test_name) Test for 10: (var li1.5), (var li0.5).
 )
-(assert
+(assert!
    (= 12 (var li1.6) (var li0.6))
    [FAILED] (var test_name) Test for 12: (var li1.6), (var li0.6).
 )
-(assert
+(assert!
    (= 14 (var li1.7) (var li0.7))
    [FAILED] (var test_name) Test for 14: (var li1.7), (var li0.7).
 )
-(assert
+(assert!
    (= 16 (var li1.8) (var li0.8))
    [FAILED] (var test_name) Test for 16: (var li1.8), (var li0.8).
 )
-(assert
+(assert!
    (= 18 (var li1.9) (var li0.9))
    [FAILED] (var test_name) Test for 18: (var li1.9), (var li0.9).
 )
-(assert
+(assert!
    (= 20 (var li1.10) (var li0.10))
    [FAILED] (var test_name) Test for 20: (var li1.10), (var li0.10).
 )
 
-(clear li0)
-(clear li1)
-(clear li2)
-(clear li3)
+(clear! li0)
+(clear! li1)
+(clear! li2)
+(clear! li3)
 
-(set li0
+(set! li0
    (indexed_map
       (lambda ((int ix) (int i)) (+ (* i ix) 1000))
       (range 10 20 1)
    )
 )
 
-(set li1 (range 10 20 1))
+(set! li1 (range 10 20 1))
 
 (indexed_map!
    (lambda ((int ix) (int i)) (+ (* i ix) 1000))
    li1
 )
 
-(set li2
+(set! li2
    (indexed_map
       (lambda ((int ix) (int i) (int mod)) (+ (* i ix) mod))
       (range 10 20 1)
@@ -118,7 +118,7 @@
    )
 )
 
-(set li3 (range 10 20 1))
+(set! li3 (range 10 20 1))
 
 (indexed_map!
    (lambda ((int ix) (int i) (int mod)) (+ (* i ix) mod))
@@ -126,15 +126,15 @@
    1000
 )
 
-(assert
+(assert!
    (= (var li1) (var li0) (var li2) (var li3))
    [FAILED] (var test_name) Equality test 1.
 )
 
 (global int i)
 
-(for (set i 0) (=< i 10) (set i (+ i 1))
-   (assert
+(for (set! i 0) (=< i 10) (set! i (+ i 1))
+   (assert!
       (=
          (access i li1) (access i li0) (access i li2) (access i li3)
          (+ (* i (+ 10 i)) 1000)
@@ -146,4 +146,4 @@
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/merge.fate b/data/unit-testing/merge.fate
index 4915ff8..4989b47 100644
--- a/data/unit-testing/merge.fate
+++ b/data/unit-testing/merge.fate
@@ -2,7 +2,7 @@
 
 (global string test_name)
 
-(set test_name ( MERGE ))
+(set! test_name ( MERGE ))
 
 (local int i)
 (local int j)
@@ -19,7 +19,7 @@
 (global (list int) li1oa)
 (global (list int) li1ob)
 
-(set li0
+(set! li0
    (merge_to_list
       (lambda
          (
@@ -33,7 +33,7 @@
    )
 )
 
-(set li0oa
+(set! li0oa
    (merge_to_list
       (lambda
          (
@@ -47,7 +47,7 @@
    )
 )
 
-(set li0ob
+(set! li0ob
    (merge_to_list
       (lambda
          (
@@ -61,9 +61,9 @@
    )
 )
 
-(set li1 (range 10 40 1))
-(set li1oa (range 10 60 1))
-(set li1ob (range 10 40 1))
+(set! li1 (range 10 40 1))
+(set! li1oa (range 10 60 1))
+(set! li1ob (range 10 40 1))
 
 (merge!
    (lambda
@@ -101,13 +101,13 @@
    li1ob
 )
 
-(assert
+(assert!
    (= (var li1) (var li0) (var li0oa) (var li0ob) (var li1oa) (var li1ob))
    [FAILED] (var test_name) Equality test 0.
 )
 
-(for (set i 0) (=< i 30) (set i (+ i 1))
-   (assert
+(for (set! i 0) (=< i 30) (set! i (+ i 1))
+   (assert!
       (=
          (- (+ 10 i) (* 2 i))
          (access i li0)
@@ -138,7 +138,7 @@
 (global (set int) si1oa)
 (global (set int) si1ob)
 
-(set si0
+(set! si0
    (merge_to_set
       (lambda
          (
@@ -152,7 +152,7 @@
    )
 )
 
-(set si0oa
+(set! si0oa
    (merge_to_set
       (lambda
          (
@@ -166,7 +166,7 @@
    )
 )
 
-(set si0ob
+(set! si0ob
    (merge_to_set
       (lambda
          (
@@ -220,22 +220,22 @@
    si1ob
 )
 
-(assert
+(assert!
    (= (var si0) (var si0oa) (var si0ob) (var si1) (var si1oa) (var si1ob))
    [FAILED] (var test_name) Equality test 1.
 )
 
 (for
    (
-      (set i 0)
-      (set j 30)
+      (set! i 0)
+      (set! j 30)
    )
    (=< i 30)
    (
-      (set i (+ i 1))
-      (set j (- j 1))
+      (set! i (+ i 1))
+      (set! j (- j 1))
    )
-   (assert
+   (assert!
       (=
          (- (+ 10 j) (* 2 j))
          (access i si0)
@@ -266,7 +266,7 @@
 (global (set int) si3oa)
 (global (set int) si3ob)
 
-(set si2
+(set! si2
    (merge_to_set
       (lambda
          (
@@ -282,7 +282,7 @@
    )
 )
 
-(set si2oa
+(set! si2oa
    (merge_to_set
       (lambda
          (
@@ -298,7 +298,7 @@
    )
 )
 
-(set si2ob
+(set! si2ob
    (merge_to_set
       (lambda
          (
@@ -360,16 +360,16 @@
    -1
 )
 
-(assert
+(assert!
    (= (var si2) (var si2oa) (var si2ob) (var si3) (var si3oa) (var si3ob))
    [FAILED] (var test_name) Equality test 2.
 )
 
 (for
-   (set i 0)
+   (set! i 0)
    (=< i 30)
-   (set i (+ i 1))
-   (assert
+   (set! i (+ i 1))
+   (assert!
       (=
          (* (- (+ 10 i) (* 2 i)) -1)
          (access i si2)
@@ -400,7 +400,7 @@
 (global (list int) ili1oa)
 (global (list int) ili1ob)
 
-(set ili0
+(set! ili0
    (indexed_merge_to_list
       (lambda
          (
@@ -415,7 +415,7 @@
    )
 )
 
-(set ili0oa
+(set! ili0oa
    (indexed_merge_to_list
       (lambda
          (
@@ -430,7 +430,7 @@
    )
 )
 
-(set ili0ob
+(set! ili0ob
    (indexed_merge_to_list
       (lambda
          (
@@ -445,9 +445,9 @@
    )
 )
 
-(set ili1 (range 10 40 1))
-(set ili1oa (range 10 60 1))
-(set ili1ob (range 10 40 1))
+(set! ili1 (range 10 40 1))
+(set! ili1oa (range 10 60 1))
+(set! ili1ob (range 10 40 1))
 
 (indexed_merge!
    (lambda
@@ -488,13 +488,13 @@
    ili1ob
 )
 
-(assert
+(assert!
    (= (var ili1) (var ili0) (var ili0oa) (var ili0ob) (var ili1oa) (var ili1ob))
    [FAILED] (var test_name) Equality test indexed 0.
 )
 
-(for (set i 0) (=< i 30) (set i (+ i 1))
-   (assert
+(for (set! i 0) (=< i 30) (set! i (+ i 1))
+   (assert!
       (=
          (* (- (+ 10 i) (* 2 i)) i)
          (access i ili0)
@@ -519,9 +519,9 @@
 ;;; INDEXED TEST 1 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 For reference, the values found in the sets are:
-(for (set i 0) (=< i 30) (set i (+ i 1))
+(for (set! i 0) (=< i 30) (set! i (+ i 1))
    (local int o)
-   (set o (* (- (+ 10 i) (* 2 i)) (+ i 1)))
+   (set! o (* (- (+ 10 i) (* 2 i)) (+ i 1)))
    (var o) (newline)
    (add! (var o) oracle_set)
 )
@@ -533,7 +533,7 @@ For reference, the values found in the sets are:
 (global (set int) isi1oa)
 (global (set int) isi1ob)
 
-(set isi0
+(set! isi0
    (indexed_merge_to_set
       (lambda
          (
@@ -548,7 +548,7 @@ For reference, the values found in the sets are:
    )
 )
 
-(set isi0oa
+(set! isi0oa
    (indexed_merge_to_set
       (lambda
          (
@@ -563,7 +563,7 @@ For reference, the values found in the sets are:
    )
 )
 
-(set isi0ob
+(set! isi0ob
    (indexed_merge_to_set
       (lambda
          (
@@ -621,13 +621,13 @@ For reference, the values found in the sets are:
    isi1ob
 )
 
-(assert
+(assert!
    (= (var isi0) (var isi0oa) (var isi0ob) (var isi1) (var isi1oa) (var isi1ob))
    [FAILED] (var test_name) Equality test indexed 1.
 )
 
-(for (set i (- (size oracle_set) 1)) (>= i 0) (set i (- i 1))
-   (assert
+(for (set! i (- (size oracle_set) 1)) (>= i 0) (set! i (- i 1))
+   (assert!
       (=
          (access i oracle_set)
          (access i isi0)
@@ -648,16 +648,16 @@ For reference, the values found in the sets are:
    )
 )
 
-(clear oracle_set)
+(clear! oracle_set)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; INDEXED TEST 2 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 For reference, the values found in the sets are:
-(for (set i 0) (=< i 30) (set i (+ i 1))
+(for (set! i 0) (=< i 30) (set! i (+ i 1))
    (local int o)
-   (set o (* (- (+ 10 i) (* 2 i)) -1 (+ i 1)))
+   (set! o (* (- (+ 10 i) (* 2 i)) -1 (+ i 1)))
    (var o) (newline)
    (add! (var o) oracle_set)
 )
@@ -669,7 +669,7 @@ For reference, the values found in the sets are:
 (global (set int) isi3oa)
 (global (set int) isi3ob)
 
-(set isi2
+(set! isi2
    (indexed_merge_to_set
       (lambda
          (
@@ -686,7 +686,7 @@ For reference, the values found in the sets are:
    )
 )
 
-(set isi2oa
+(set! isi2oa
    (indexed_merge_to_set
       (lambda
          (
@@ -703,7 +703,7 @@ For reference, the values found in the sets are:
    )
 )
 
-(set isi2ob
+(set! isi2ob
    (indexed_merge_to_set
       (lambda
          (
@@ -769,13 +769,13 @@ For reference, the values found in the sets are:
    -1
 )
 
-(assert
+(assert!
    (= (var isi2) (var isi2oa) (var isi2ob) (var isi3) (var isi3oa) (var isi3ob))
    [FAILED] (var test_name) Equality test indexed 2.
 )
 
-(for (set i (- (size oracle_set) 1)) (>= i 0) (set i (- i 1))
-   (assert
+(for (set! i (- (size oracle_set) 1)) (>= i 0) (set! i (- i 1))
+   (assert!
       (=
          (access i oracle_set)
          (access i isi2)
@@ -804,7 +804,7 @@ For reference, the values found in the sets are:
 (global (list int) sli2)
 (global (list int) sli3)
 
-(set sli0
+(set! sli0
    (safe_merge_to_list
       (lambda
          (
@@ -820,7 +820,7 @@ For reference, the values found in the sets are:
    )
 )
 
-(set sli1
+(set! sli1
    (safe_merge_to_list
       (lambda
          (
@@ -836,18 +836,18 @@ For reference, the values found in the sets are:
    )
 )
 
-(for (set i 0) (=< i 10) (set i (+ i 1))
-   (assert
+(for (set! i 0) (=< i 10) (set! i (+ i 1))
+   (assert!
       (= (access i sli0) (access i sli1) (- i 1))
       [FAILED] (var test_name) Equality test safe 0.
    )
 )
 
-(assert
+(assert!
    (= (var sli0) (var sli1))
    [FAILED] (var test_name) Equality test safe 0.
 )
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/data/unit-testing/ptr_and_at.fate b/data/unit-testing/ptr_and_at.fate
index 2baf6ce..4ccaa26 100644
--- a/data/unit-testing/ptr_and_at.fate
+++ b/data/unit-testing/ptr_and_at.fate
@@ -2,7 +2,7 @@
 
 (global string test_name)
 
-(set test_name ( PTR AND AT ))
+(set! test_name ( PTR AND AT ))
 
 (global int i)
 (global int j)
@@ -39,35 +39,35 @@
 
 (global (list test_struct1) test_struct1_list)
 
-(set i 100)
-(set j 2000)
+(set! i 100)
+(set! j 2000)
 
-(set i_ptr (ptr i))
-(set j_ptr (ptr j))
+(set! i_ptr (ptr i))
+(set! j_ptr (ptr j))
 
-(set int_ptr_ptr (ptr i_ptr))
+(set! int_ptr_ptr (ptr i_ptr))
 
-(assert (= (var i) (at i_ptr) (at (at int_ptr_ptr))) [FAILED] (var test_name) equality 0.)
+(assert! (= (var i) (at i_ptr) (at (at int_ptr_ptr))) [FAILED] (var test_name) equality 0.)
 
-(set i_ptr (ptr j))
+(set! i_ptr (ptr j))
 
-(assert (= (var j) (at i_ptr) (at (at int_ptr_ptr))) [FAILED] (var test_name) equality 1.)
+(assert! (= (var j) (at i_ptr) (at (at int_ptr_ptr))) [FAILED] (var test_name) equality 1.)
 
 (global int b)
 
-(set j_ptr (ptr b))
+(set! j_ptr (ptr b))
 
-(set (at j_ptr) (at (at int_ptr_ptr)))
+(set! (at j_ptr) (at (at int_ptr_ptr)))
 
-(assert (= (var b) (var j) (at i_ptr) (at (at int_ptr_ptr))) [FAILED] (var test_name) equality 2.)
+(assert! (= (var b) (var j) (at i_ptr) (at (at int_ptr_ptr))) [FAILED] (var test_name) equality 2.)
 
 (global (ptr int) b_ptr)
-(set i 100)
-(set j 2000)
-(set i_ptr (ptr i))
-(set j_ptr (ptr j))
-(set b_ptr (ptr b))
-(set int_ptr_ptr (ptr b_ptr))
+(set! i 100)
+(set! j 2000)
+(set! i_ptr (ptr i))
+(set! j_ptr (ptr j))
+(set! b_ptr (ptr b))
+(set! int_ptr_ptr (ptr b_ptr))
 
 (global test_struct0 ts0)
 
@@ -86,12 +86,12 @@
 (add! (var ts0.int_ptr0) ts0.int_ptr_list)
 (add! (var ts0.int_ptr1) ts0.int_ptr_list)
 
-(assert (= (var ts0.int_ptr_list.0) (var i_ptr) (ptr i)) [FAILED] (var test_name) equality 3.)
-(assert (= (var ts0.int_ptr_list.1) (var j_ptr) (ptr j)) [FAILED] (var test_name) equality 4.)
-(assert (= (var ts0.int_ptr_list.2) (var b_ptr) (ptr b)) [FAILED] (var test_name) equality 5.)
-(assert (= (at ts0.int_ptr_list.3) (at ts0.int_ptr0) (at (ptr ts0.int0)) (var ts0.int0)) [FAILED] (var test_name) equality 6.)
-(assert (= (at ts0.int_ptr_list.4) (at ts0.int_ptr1) (at (ptr ts0.int1)) (var ts0.int1)) [FAILED] (var test_name) equality 7.)
+(assert! (= (var ts0.int_ptr_list.0) (var i_ptr) (ptr i)) [FAILED] (var test_name) equality 3.)
+(assert! (= (var ts0.int_ptr_list.1) (var j_ptr) (ptr j)) [FAILED] (var test_name) equality 4.)
+(assert! (= (var ts0.int_ptr_list.2) (var b_ptr) (ptr b)) [FAILED] (var test_name) equality 5.)
+(assert! (= (at ts0.int_ptr_list.3) (at ts0.int_ptr0) (at (ptr ts0.int0)) (var ts0.int0)) [FAILED] (var test_name) equality 6.)
+(assert! (= (at ts0.int_ptr_list.4) (at ts0.int_ptr1) (at (ptr ts0.int1)) (var ts0.int1)) [FAILED] (var test_name) equality 7.)
 
 [COMPLETED] (var test_name)
 
-(end)
+(end!)
diff --git a/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4 b/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4
index c9283c7..7accac5 100644
--- a/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4
+++ b/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4
@@ -25,13 +25,13 @@ IMP_ADD_AT_KW: L_PAREN 'add'(US'element')?US'at!' SEP+;
 ADD_ALL_KW: L_PAREN 'add'US'all'(US'elements')? SEP+;
 IMP_ADD_ALL_KW: L_PAREN 'add'US'all'(US'elements')?'!' SEP+;
 AND_KW: L_PAREN ('and'|'/\\') SEP+;
-ASSERT_KW: L_PAREN 'assert' SEP+;
+IMP_ASSERT_KW: L_PAREN 'assert!' SEP+;
 AT_KW: L_PAREN 'at' SEP+;
-BREAK_KW: L_PAREN 'break)';
+IMP_BREAK_KW: L_PAREN 'break'('!'?) SEP* R_PAREN;
 CAR_KW: L_PAREN 'car' SEP+;
 CAST_KW: L_PAREN 'cast' SEP+;
 CDR_KW: L_PAREN 'cdr' SEP+;
-CLEAR_KW: L_PAREN 'clear' SEP+;
+IMP_CLEAR_KW: L_PAREN 'clear!' SEP+;
 COND_KW: L_PAREN 'cond' SEP+;
 CONS_KW: L_PAREN 'cons' SEP+;
 COUNT_KW: L_PAREN 'count' SEP+;
@@ -51,14 +51,15 @@ DEFINE_SEQUENCE_KW: L_PAREN ('declare'|'define'|'def')US(('seq'('uence')?)|('pro
 DIVIDE_KW: L_PAREN ('divide'|'/'|'div') SEP+;
 DO_WHILE_KW: L_PAREN ('do'US'while') SEP+;
 ENABLE_TEXT_EFFECT_KW: L_PAREN 'text'US'effect' SEP+;
-END_KW: L_PAREN 'end)';
+END_KW: L_PAREN 'end'('!'?) SEP* R_PAREN;
 EQUALS_KW: L_PAREN ('equals'|'='|'=='|'eq') SEP+;
 EXTENSION_FIRST_LEVEL_KW: L_PAREN '@';
 EXTRA_INSTRUCTION_KW: L_PAREN '#';
 JOIN_KW: L_PAREN ('text'US)? 'join' SEP+;
 EXTRA_COMPUTATION_KW: L_PAREN '$';
-FALSE_KW: L_PAREN 'false)';
+FALSE_KW: L_PAREN 'false' SEP* R_PAREN;
 IGNORE_ERROR_KW: L_PAREN 'ignore'US('error'|'warning') SEP+;
+IMP_IGNORE_ERROR_KW: L_PAREN 'ignore'US('error'|'warning')'!' SEP+;
 FATE_VERSION_KW: L_PAREN 'fate'US'version' SEP+;
 FIELD_KW: L_PAREN 'field' SEP+;
 FIELD_ACCESS_KW: L_PAREN (('get'US'field')|('field'US'access')) SEP+;
@@ -70,7 +71,7 @@ FOR_EACH_KW: L_PAREN ('for'US'each') SEP+;
 FOR_KW: L_PAREN 'for' SEP+;
 FOLDR_KW: L_PAREN 'foldr' SEP+;
 FOLDL_KW: L_PAREN 'foldl' SEP+;
-FREE_KW: L_PAREN ('free'|'release'|'destroy') SEP+;
+FREE_KW: L_PAREN ('free!'|'release!'|'destroy!') SEP+;
 GREATER_EQUAL_THAN_KW: L_PAREN ('greater'US'equal'US'than'|'>='|'ge') SEP+;
 GREATER_THAN_KW: L_PAREN ('greater'US'than'|'>'|'gt') SEP+;
 IF_ELSE_KW: L_PAREN ('if'US'else') SEP+;
@@ -107,8 +108,8 @@ SAFE_INDEXED_MERGE_TO_LIST_KW : L_PAREN (('safe'US'indexed')|('indexed'US'safe')
 SAFE_INDEXED_MERGE_TO_SET_KW : L_PAREN (('safe'US'indexed')|('indexed'US'safe'))US'merge'US'to'US'set' SEP+;
 SAFE_IMP_MERGE_KW : L_PAREN 'safe'US'merge!' SEP+;
 SAFE_IMP_INDEXED_MERGE_KW : L_PAREN (('indexed'US'safe')|('safe'US'indexed'))US'merge!' SEP+;
-NEWLINE_KW: L_PAREN 'newline)';
-ALLOCATE_KW: L_PAREN (('alloc''ate'?)|'malloc'|'new')'!'? SEP+;
+NEWLINE_KW: L_PAREN 'newline' SEP* R_PAREN;
+ALLOCATE_KW: L_PAREN (('alloc''ate'?)|'malloc'|'new')'!' SEP+;
 NOT_KW: L_PAREN ('not'|'~'|'!') SEP+;
 ONE_IN_KW: L_PAREN ('exactly'US)?'one'(US'in')? SEP+;
 OR_KW: L_PAREN ('or'|'\\/') SEP+;
@@ -132,7 +133,7 @@ PLUS_KW: L_PAREN ('plus'|'+') SEP+;
 POWER_KW: L_PAREN ('power'|'^'|'**'|'pow') SEP+;
 RANGE_KW: L_PAREN 'range' SEP+;
 RANDOM_KW: L_PAREN ('random'|'rand'|'rnd') SEP+;
-REF_KW: L_PAREN (((('ref'('erence'?))|'ptr'|'pointer')(US'to')?)|('address'(US'of'))) SEP+;
+REF_KW: L_PAREN (((('ref'('erence'?))|'ptr'|'pointer')(US'to')?)|('addr'('ess'?)(US'of')?)) SEP+;
 REMOVE_ALL_KW: L_PAREN 'remove'US'all' SEP+;
 IMP_REMOVE_ALL_KW: L_PAREN 'remove'US'all!' SEP+;
 REVERSE_KW: L_PAREN 'reverse'(US'list')? SEP+;
@@ -143,15 +144,15 @@ REMOVE_AT_KW: L_PAREN ('remove'US('elem'('ent')?US)?'at') SEP+;
 IMP_REMOVE_AT_KW: L_PAREN ('remove'US('elem'('ent')?US)?'at!') SEP+;
 REQUIRE_EXTENSION_KW: L_PAREN 'require'US'extension' SEP+;
 REQUIRE_KW: L_PAREN 'require' SEP+;
-PROMPT_STRING_KW: L_PAREN 'prompt_string' SEP+;
-PROMPT_INTEGER_KW: L_PAREN 'prompt_int'('eger'?) SEP+;
+PROMPT_STRING_KW: L_PAREN 'prompt_string!' SEP+;
+PROMPT_INTEGER_KW: L_PAREN 'prompt_int'('eger'?)'!' SEP+;
 SHUFFLE_KW: L_PAREN 'shuffle' SEP+;
 IMP_SHUFFLE_KW: L_PAREN 'shuffle!' SEP+;
 SORT_KW: L_PAREN 'sort' SEP+;
 IMP_SORT_KW: L_PAREN 'sort!' SEP+;
 SET_FIELDS_KW: L_PAREN 'set'US'fields' SEP+;
 IMP_SET_FIELDS_KW: L_PAREN 'set'US'fields!' SEP+;
-SET_KW: L_PAREN 'set'(US(('val''ue'?)|('var''iable'?)))?'!'? SEP+;
+IMP_SET_KW: L_PAREN 'set'(US(('val''ue'?)|('var''iable'?)))?'!' SEP+;
 SUB_LIST_KW: L_PAREN 'sub'US'list' SEP+;
 IMP_SUB_LIST_KW: L_PAREN 'sub'US'list!' SEP+;
 LIST_KW: L_PAREN 'list' SEP+;
@@ -159,11 +160,12 @@ SIZE_KW: L_PAREN 'size' SEP+;
 SEQUENCE_KW: L_PAREN ('seq'|'sequence') SEP+;
 SWITCH_KW: L_PAREN 'switch' SEP+;
 TIMES_KW: L_PAREN ('times'|'*') SEP+;
-TRUE_KW: L_PAREN 'true)';
-DONE_KW: L_PAREN 'done)';
+TRUE_KW: L_PAREN 'true' SEP* R_PAREN;
+DONE_KW: L_PAREN 'done''!'? SEP* R_PAREN;
+SET_KW: L_PAREN 'set' SEP+;
 VARIABLE_KW: L_PAREN ('variable'|'var') SEP+;
-VISIT_KW: L_PAREN ('call'|'visit')(US(('seq'('uence'?))|('proc'('edure'?))))? SEP+;
-CONTINUE_AS_KW: L_PAREN (('continue'US('as'|'to'|'with'))|('jump'(US'to')?)|('go'US'to')|'exec')(US(('seq'('uence'?))|('proc'('edure'?))))? SEP+;
+VISIT_KW: L_PAREN ('call'|'visit')(US(('seq'('uence'?))|('proc'('edure'?))))?'!' SEP+;
+CONTINUE_AS_KW: L_PAREN (('continue'US('as'|'to'|'with'))|('jump'(US'to')?)|('go'US'to')|'exec')(US(('seq'('uence'?))|('proc'('edure'?))))?'!' SEP+;
 WHILE_KW: L_PAREN 'while' SEP+;
 
 WORD: ((~([ \t\r\n()]))|'(lp)'|'(rp)'|'(sp)')+
diff --git a/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 b/src/core/src/tonkadur/fate/v1/parser/FateParser.g4
index 7736318..43b970c 100644
--- a/src/core/src/tonkadur/fate/v1/parser/FateParser.g4
+++ b/src/core/src/tonkadur/fate/v1/parser/FateParser.g4
@@ -32,6 +32,7 @@ options
 
    import tonkadur.fate.v1.error.DuplicateLocalVariableException;
    import tonkadur.fate.v1.error.IllegalReferenceNameException;
+   import tonkadur.fate.v1.error.InvalidArityException;
    import tonkadur.fate.v1.error.InvalidTypeException;
    import tonkadur.fate.v1.error.UpdatingIllegalVariableFromChoiceException;
    import tonkadur.fate.v1.error.UnknownExtensionContentException;
@@ -810,7 +811,7 @@ returns [Instruction result]
          );
    }
 
-   | IGNORE_ERROR_KW WORD WS+ general_fate_instr WS* R_PAREN
+   | IMP_IGNORE_ERROR_KW WORD WS+ general_fate_instr WS* R_PAREN
    {
       /* TODO: temporarily disable an compiler error category */
       $result = ($general_fate_instr.result);
@@ -870,15 +871,15 @@ returns [Instruction result]
          );
    }
 
-   | CLEAR_KW value_reference WS* R_PAREN
+   | IMP_CLEAR_KW value_reference WS* R_PAREN
    {
       $result =
          Clear.build
          (
             CONTEXT.get_origin_at
             (
-               ($CLEAR_KW.getLine()),
-               ($CLEAR_KW.getCharPositionInLine())
+               ($IMP_CLEAR_KW.getLine()),
+               ($IMP_CLEAR_KW.getCharPositionInLine())
             ),
             ($value_reference.result)
          );
@@ -1447,15 +1448,15 @@ returns [Instruction result]
          );
    }
 
-   | SET_KW value_reference WS+ value WS* R_PAREN
+   | IMP_SET_KW value_reference WS+ value WS* R_PAREN
    {
       $result =
          SetValue.build
          (
             CONTEXT.get_origin_at
             (
-               ($SET_KW.getLine()),
-               ($SET_KW.getCharPositionInLine())
+               ($IMP_SET_KW.getLine()),
+               ($IMP_SET_KW.getCharPositionInLine())
             ),
             ($value.result),
             ($value_reference.result)
@@ -1597,15 +1598,15 @@ returns [Instruction result]
          );
    }
 
-   | {BREAKABLE_LEVELS > 0}? BREAK_KW
+   | {BREAKABLE_LEVELS > 0}? IMP_BREAK_KW
    {
       $result =
          new Break
          (
             CONTEXT.get_origin_at
             (
-               ($BREAK_KW.getLine()),
-               ($BREAK_KW.getCharPositionInLine())
+               ($IMP_BREAK_KW.getLine()),
+               ($IMP_BREAK_KW.getCharPositionInLine())
             )
          );
    }
@@ -1953,15 +1954,15 @@ returns [Instruction result]
          );
    }
 
-   | ASSERT_KW non_text_value WS+ paragraph WS* R_PAREN
+   | IMP_ASSERT_KW non_text_value WS+ paragraph WS* R_PAREN
    {
       $result =
          Assert.build
          (
             CONTEXT.get_origin_at
             (
-               ($ASSERT_KW.getLine()),
-               ($ASSERT_KW.getCharPositionInLine())
+               ($IMP_ASSERT_KW.getLine()),
+               ($IMP_ASSERT_KW.getCharPositionInLine())
             ),
             ($non_text_value.result),
             ($paragraph.result)
@@ -4206,6 +4207,89 @@ returns [Computation result]
          );
    }
 
+   | LIST_KW value_list WS* R_PAREN
+   {
+      final Origin origin;
+
+      origin =
+         CONTEXT.get_origin_at
+         (
+            ($LIST_KW.getLine()),
+            ($LIST_KW.getCharPositionInLine())
+         );
+
+      if ($value_list.result.size() == 0)
+      {
+         ErrorManager.handle(new InvalidArityException(origin, 0, 1, -1));
+      }
+
+
+      $result =
+         new Default
+         (
+            origin,
+            CollectionType.build
+            (
+               origin,
+               ($value_list.result).get(0).get_type(),
+               false,
+               "Autogenerated List Type"
+            )
+         );
+
+      for (final Computation val: $value_list.result)
+      {
+         $result =
+            AddElementComputation.build
+            (
+               origin,
+               val,
+               $result
+            );
+      }
+   }
+
+   | SET_KW value_list WS* R_PAREN
+   {
+      final Origin origin;
+
+      origin =
+         CONTEXT.get_origin_at
+         (
+            ($SET_KW.getLine()),
+            ($SET_KW.getCharPositionInLine())
+         );
+
+      if ($value_list.result.size() == 0)
+      {
+         ErrorManager.handle(new InvalidArityException(origin, 0, 1, -1));
+      }
+
+      $result =
+         new Default
+         (
+            origin,
+            CollectionType.build
+            (
+               origin,
+               ($value_list.result).get(0).get_type(),
+               true,
+               "Autogenerated Set Type"
+            )
+         );
+
+      for (final Computation val: $value_list.result)
+      {
+         $result =
+            AddElementComputation.build
+            (
+               origin,
+               val,
+               $result
+            );
+      }
+   }
+
    | RANGE_KW
       vstart=non_text_value WS+
       vend=non_text_value WS+