From 0269c0a2943e443179ae6261b265aa06998451f7 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Wed, 23 Dec 2020 03:20:52 +0100
Subject: Parenthesis, merge stuff, main param goes last.

---
 data/unit-testing/access.fate         |   6 +-
 data/unit-testing/access_pointer.fate |  94 ++++++++---
 data/unit-testing/field_access.fate   |  10 +-
 data/unit-testing/map.fate            |   4 +-
 data/unit-testing/merge.fate          | 301 +++++++++++++++++-----------------
 5 files changed, 230 insertions(+), 185 deletions(-)

(limited to 'data')

diff --git a/data/unit-testing/access.fate b/data/unit-testing/access.fate
index 7c1976f..fe92293 100644
--- a/data/unit-testing/access.fate
+++ b/data/unit-testing/access.fate
@@ -9,13 +9,13 @@
 (global int i)
 
 (for (set i 0) (=< i 10) (set i (+ i 1))
-   (assert (= (access li i) (var i))
+   (assert (= (access i li) (var i))
       [FAILED] ACCESS assert failed on (var i) for li.
    )
-   (assert (= (access li_ptr i) (var i))
+   (assert (= (access i li_ptr) (var i))
       [FAILED] ACCESS assert failed on (var i) with for li_ptr.
    )
-   (assert (= (access (range 0 10 1) i) (var i))
+   (assert (= (access i (range 0 10 1)) (var i))
       [FAILED] ACCESS assert failed on (var i) with for range.
    )
 )
diff --git a/data/unit-testing/access_pointer.fate b/data/unit-testing/access_pointer.fate
index e9218e9..c98c31a 100644
--- a/data/unit-testing/access_pointer.fate
+++ b/data/unit-testing/access_pointer.fate
@@ -13,10 +13,10 @@
 (global int i)
 
 (for (set i 0) (=< i 10) (set i (+ i 1))
-   (assert (= (at (access_ptr li i)) (var i))
+   (assert (= (at (access_ptr i li)) (var i))
       [FAILED] ACCESS POINTER assert failed on (var i) for li.
    )
-   (assert (= (at (access_ptr li_ptr i)) (var i))
+   (assert (= (at (access_ptr i li_ptr)) (var i))
       [FAILED] ACCESS POINTER assert failed on (var i) with for li_ptr.
    )
 )
@@ -27,29 +27,73 @@
    (add! (range 0 i 1) lili)
 )
 
-(assert (= (at (access_ptr (at (access_ptr lili 10)) 0)) 0) [FAILED] (var test_name) lili.10.0 was (at (access_ptr (at (access_ptr lili 10)) 0)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 9)) 1)) 1) [FAILED] (var test_name) lili.9.1 was (at (access_ptr (at (access_ptr lili 9)) 1)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 8)) 2)) 2) [FAILED] (var test_name) lili.8.2 was (at (access_ptr (at (access_ptr lili 8)) 2)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 7)) 3)) 3) [FAILED] (var test_name) lili.7.3 was (at (access_ptr (at (access_ptr lili 7)) 3)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 6)) 4)) 4) [FAILED] (var test_name) lili.6.4 was (at (access_ptr (at (access_ptr lili 6)) 4)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 5)) 5)) 5) [FAILED] (var test_name) lili.5.5 was (at (access_ptr (at (access_ptr lili 5)) 5)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 4)) 3)) 3) [FAILED] (var test_name) lili.4.3 was (at (access_ptr (at (access_ptr lili 4)) 3)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 3)) 2)) 2) [FAILED] (var test_name) lili.3.2 was (at (access_ptr (at (access_ptr lili 3)) 2)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 2)) 1)) 1) [FAILED] (var test_name) lili.2.1 was (at (access_ptr (at (access_ptr lili 2)) 1)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 1)) 0)) 0) [FAILED] (var test_name) lili.1.0 was (at (access_ptr (at (access_ptr lili 1)) 0)) for part A.)
-(assert (= (at (access_ptr (at (access_ptr lili 0)) 0)) 0) [FAILED] (var test_name) lili.0.0 was (at (access_ptr (at (access_ptr lili 0)) 0)) for part A.)
-
-(assert (= (at (access_ptr lili.10 0)) 0) [FAILED] (var test_name) lili.10.0 was (at (access_ptr lili.10 0)) for part B.)
-(assert (= (at (access_ptr lili.9 1)) 1) [FAILED] (var test_name) lili.9.1 was (at (access_ptr lili.9 1)) for part B.)
-(assert (= (at (access_ptr lili.8 2)) 2) [FAILED] (var test_name) lili.8.2 was (at (access_ptr lili.8 2)) for part B.)
-(assert (= (at (access_ptr lili.7 3)) 3) [FAILED] (var test_name) lili.7.3 was (at (access_ptr lili.7 3)) for part B.)
-(assert (= (at (access_ptr lili.6 4)) 4) [FAILED] (var test_name) lili.6.4 was (at (access_ptr lili.6 4)) for part B.)
-(assert (= (at (access_ptr lili.5 5)) 5) [FAILED] (var test_name) lili.5.5 was (at (access_ptr lili.5 5)) for part B.)
-(assert (= (at (access_ptr lili.4 3)) 3) [FAILED] (var test_name) lili.4.3 was (at (access_ptr lili.4 3)) for part B.)
-(assert (= (at (access_ptr lili.3 2)) 2) [FAILED] (var test_name) lili.3.2 was (at (access_ptr lili.3 2)) for part B.)
-(assert (= (at (access_ptr lili.2 1)) 1) [FAILED] (var test_name) lili.2.1 was (at (access_ptr lili.2 1)) for part B.)
-(assert (= (at (access_ptr lili.1 0)) 0) [FAILED] (var test_name) lili.1.0 was (at (access_ptr lili.1 0)) for part B.)
-(assert (= (at (access_ptr lili.0 0)) 0) [FAILED] (var test_name) lili.0.0 was (at (access_ptr lili.0 0)) for part B.)
+(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
+   (= (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
+   (= (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
+   (= (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
+   (= (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
+   (= (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
+   (= (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
+   (= (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
+   (= (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
+   (= (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
+   (= (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.)
 
 [COMPLETED] ACCESS POINTER
 
diff --git a/data/unit-testing/field_access.fate b/data/unit-testing/field_access.fate
index dbc2c18..715e706 100644
--- a/data/unit-testing/field_access.fate
+++ b/data/unit-testing/field_access.fate
@@ -68,7 +68,7 @@
 )
 
 (assert
-   (= (get_field ts0_0 i) (var ts0_0.i) (get_field ts0_1 k) (var ts0_1.k) 42)
+   (= (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)
    ts0_0.i = (var ts0_0.i)
@@ -77,7 +77,7 @@
 )
 
 (assert
-   (= (get_field ts0_1 i) (var ts0_1.i) (get_field ts0_0 k) (var ts0_0.k) 420)
+   (= (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)
    ts0_0.k = (var ts0_0.k)
@@ -87,9 +87,9 @@
 
 (assert
    (=
-      (field ts0_1 i)
-      (get_field (set_fields ts1_0 (i 420)) i)
-      (get_field (field (field ts2_0 ts1) ts0) i)
+      (field i ts0_1)
+      (get_field i (set_fields ts1_0 (i 420)))
+      (get_field i (field ts0 (field ts1 ts2_0)))
       420
    )
    [FAILED] (var test_name) Test 2.
diff --git a/data/unit-testing/map.fate b/data/unit-testing/map.fate
index bf8517f..bea1ada 100644
--- a/data/unit-testing/map.fate
+++ b/data/unit-testing/map.fate
@@ -136,11 +136,11 @@
 (for (set i 0) (=< i 10) (set i (+ i 1))
    (assert
       (=
-         (access li1 i) (access li0 i) (access li2 i) (access li3 i)
+         (access i li1) (access i li0) (access i li2) (access i li3)
          (+ (* i (+ 10 i)) 1000)
       )
       [FAILED] (var test_name) Indexed map at (var i):
-      (access li1 i), (access li0 i), (access li2 i), (access li3 i)
+      (access i li1), (access i li0), (access i li2), (access i li3)
    )
 )
 
diff --git a/data/unit-testing/merge.fate b/data/unit-testing/merge.fate
index 88bc732..ba40724 100644
--- a/data/unit-testing/merge.fate
+++ b/data/unit-testing/merge.fate
@@ -26,10 +26,10 @@
             (int a)
             (int b)
          )
-         (- a b)
+         (- b a)
       )
-      (range 10 40 1)
       (range 0 60 2)
+      (range 10 40 1)
    )
 )
 
@@ -40,10 +40,10 @@
             (int a)
             (int b)
          )
-         (- a b)
+         (- b a)
       )
-      (range 10 70 1)
       (range 0 60 2)
+      (range 10 70 1)
    )
 )
 
@@ -54,10 +54,10 @@
             (int a)
             (int b)
          )
-         (- a b)
+         (- b a)
       )
-      (range 10 40 1)
       (range 0 80 2)
+      (range 10 40 1)
    )
 )
 
@@ -71,10 +71,10 @@
          (int a)
          (int b)
       )
-      (- a b)
+      (- b a)
    )
-   li1
    (range 0 60 2)
+   li1
 )
 
 (merge!
@@ -83,10 +83,10 @@
          (int a)
          (int b)
       )
-      (- a b)
+      (- b a)
    )
-   li1oa
    (range 0 60 2)
+   li1oa
 )
 
 (merge!
@@ -95,10 +95,10 @@
          (int a)
          (int b)
       )
-      (- a b)
+      (- b a)
    )
-   li1ob
    (range 0 160 2)
+   li1ob
 )
 
 (assert
@@ -110,21 +110,21 @@
    (assert
       (=
          (- (+ 10 i) (* 2 i))
-         (access li0 i)
-         (access li0oa i)
-         (access li0ob i)
-         (access li1 i)
-         (access li1oa i)
-         (access li1ob i)
+         (access i li0)
+         (access i li0oa)
+         (access i li0ob)
+         (access i li1)
+         (access i li1oa)
+         (access i li1ob)
       )
       [FAILED] (var test_name) Basic test 0, index (var i), values:
       Expected: (- (+ 10 i) (* 2 i));
-      li0: (access li0 i);
-      li0oa: (access li0oa i);
-      li0ob: (access li0ob i);
-      li1: (access li1 i);
-      li1oa: (access li1oa i);
-      li1ob: (access li1ob i)
+      li0: (access i li0);
+      li0oa: (access i li0oa);
+      li0ob: (access i li0ob);
+      li1: (access i li1);
+      li1oa: (access i li1oa);
+      li1ob: (access i li1ob)
    )
 )
 
@@ -145,10 +145,10 @@
             (int a)
             (int b)
          )
-         (- a b)
+         (- b a)
       )
-      (range 10 40 1)
       (range 0 60 2)
+      (range 10 40 1)
    )
 )
 
@@ -159,10 +159,10 @@
             (int a)
             (int b)
          )
-         (- a b)
+         (- b a)
       )
-      (range 10 70 1)
       (range 0 60 2)
+      (range 10 70 1)
    )
 )
 
@@ -173,10 +173,10 @@
             (int a)
             (int b)
          )
-         (- a b)
+         (- b a)
       )
-      (range 10 40 1)
       (range 0 80 2)
+      (range 10 40 1)
    )
 )
 
@@ -190,10 +190,10 @@
          (int a)
          (int b)
       )
-      (- a b)
+      (- b a)
    )
-   si1
    (range 0 60 2)
+   si1
 )
 
 (merge!
@@ -202,10 +202,10 @@
          (int a)
          (int b)
       )
-      (- a b)
+      (- b a)
    )
-   si1oa
    (range 0 60 2)
+   si1oa
 )
 
 (merge!
@@ -214,10 +214,10 @@
          (int a)
          (int b)
       )
-      (- a b)
+      (- b a)
    )
-   si1ob
    (range 0 80 2)
+   si1ob
 )
 
 (assert
@@ -238,21 +238,21 @@
    (assert
       (=
          (- (+ 10 j) (* 2 j))
-         (access si0 i)
-         (access si0oa i)
-         (access si0ob i)
-         (access si1 i)
-         (access si1oa i)
-         (access si1ob i)
+         (access i si0)
+         (access i si0oa)
+         (access i si0ob)
+         (access i si1)
+         (access i si1oa)
+         (access i si1ob)
       )
       [FAILED] (var test_name) Basic test 1, index (var i), values:
       Expected: (- (+ 10 j) (* 2 j));
-      si0: (access si0 i);
-      si0oa: (access si0oa i);
-      si0ob: (access si0ob i);
-      si1: (access si1 i);
-      si1oa: (access si1oa i);
-      si1ob: (access si1ob i);
+      si0: (access i si0);
+      si0oa: (access i si0oa);
+      si0ob: (access i si0ob);
+      si1: (access i si1);
+      si1oa: (access i si1oa);
+      si1ob: (access i si1ob);
    )
 )
 
@@ -274,10 +274,10 @@
             (int b)
             (int mod)
          )
-         (* (- a b) mod)
+         (* (- b a) mod)
       )
-      (range 10 40 1)
       (range 0 60 2)
+      (range 10 40 1)
       -1
    )
 )
@@ -290,10 +290,10 @@
             (int b)
             (int mod)
          )
-         (* (- a b) mod)
+         (* (- b a) mod)
       )
-      (range 10 80 1)
       (range 0 60 2)
+      (range 10 80 1)
       -1
    )
 )
@@ -306,10 +306,10 @@
             (int b)
             (int mod)
          )
-         (* (- a b) mod)
+         (* (- b a) mod)
       )
-      (range 10 40 1)
       (range 0 80 2)
+      (range 10 40 1)
       -1
    )
 )
@@ -325,10 +325,10 @@
          (int b)
          (int mod)
       )
-      (* (- a b) mod)
+      (* (- b a) mod)
    )
-   si3
    (range 0 60 2)
+   si3
    -1
 )
 
@@ -339,10 +339,10 @@
          (int b)
          (int mod)
       )
-      (* (- a b) mod)
+      (* (- b a) mod)
    )
-   si3oa
    (range 0 60 2)
+   si3oa
    -1
 )
 
@@ -353,10 +353,10 @@
          (int b)
          (int mod)
       )
-      (* (- a b) mod)
+      (* (- b a) mod)
    )
-   si3ob
    (range 0 90 2)
+   si3ob
    -1
 )
 
@@ -372,21 +372,21 @@
    (assert
       (=
          (* (- (+ 10 i) (* 2 i)) -1)
-         (access si2 i)
-         (access si2oa i)
-         (access si2ob i)
-         (access si3 i)
-         (access si3oa i)
-         (access si3ob i)
+         (access i si2)
+         (access i si2oa)
+         (access i si2ob)
+         (access i si3)
+         (access i si3oa)
+         (access i si3ob)
       )
       [FAILED] (var test_name) Basic test 2, index (var i), values:
       Expected: (* (- (+ 10 i) (* 2 i)) -1);
-      si2: (access si2 i);
-      si2oa: (access si2oa i);
-      si2ob: (access si2ob i);
-      si3: (access si3 i);
-      si3oa: (access si3oa i);
-      si3ob: (access si3ob i)
+      si2: (access i si2);
+      si2oa: (access i si2oa);
+      si2ob: (access i si2ob);
+      si3: (access i si3);
+      si3oa: (access i si3oa);
+      si3ob: (access i si3ob)
    )
 )
 
@@ -408,10 +408,10 @@
             (int a)
             (int b)
          )
-         (* (- a b) i)
+         (* (- b a) i)
       )
-      (range 10 40 1)
       (range 0 60 2)
+      (range 10 40 1)
    )
 )
 
@@ -423,10 +423,10 @@
             (int a)
             (int b)
          )
-         (* (- a b) i)
+         (* (- b a) i)
       )
-      (range 10 70 1)
       (range 0 60 2)
+      (range 10 70 1)
    )
 )
 
@@ -438,10 +438,10 @@
             (int a)
             (int b)
          )
-         (* (- a b) i)
+         (* (- b a) i)
       )
-      (range 10 40 1)
       (range 0 80 2)
+      (range 10 40 1)
    )
 )
 
@@ -456,10 +456,10 @@
          (int a)
          (int b)
       )
-      (* (- a b) i)
+      (* (- b a) i)
    )
-   ili1
    (range 0 60 2)
+   ili1
 )
 
 (indexed_merge!
@@ -469,10 +469,10 @@
          (int a)
          (int b)
       )
-      (* (- a b) i)
+      (* (- b a) i)
    )
-   ili1oa
    (range 0 60 2)
+   ili1oa
 )
 
 (indexed_merge!
@@ -482,10 +482,10 @@
          (int a)
          (int b)
       )
-      (* (- a b) i)
+      (* (- b a) i)
    )
-   ili1ob
    (range 0 160 2)
+   ili1ob
 )
 
 (assert
@@ -497,21 +497,21 @@
    (assert
       (=
          (* (- (+ 10 i) (* 2 i)) i)
-         (access ili0 i)
-         (access ili0oa i)
-         (access ili0ob i)
-         (access ili1 i)
-         (access ili1oa i)
-         (access ili1ob i)
+         (access i ili0)
+         (access i ili0oa)
+         (access i ili0ob)
+         (access i ili1)
+         (access i ili1oa)
+         (access i ili1ob)
       )
       [FAILED] (var test_name) Indexed test 0, index (var i), values:
       Expected: (* (- (+ 10 i) (* 2 i)) i);
-      ili0: (access ili0 i);
-      ili0oa: (access ili0oa i);
-      ili0ob: (access ili0ob i);
-      ili1: (access ili1 i);
-      ili1oa: (access ili1oa i);
-      ili1ob: (access ili1ob i)
+      ili0: (access i ili0);
+      ili0oa: (access i ili0oa);
+      ili0ob: (access i ili0ob);
+      ili1: (access i ili1);
+      ili1oa: (access i ili1oa);
+      ili1ob: (access i ili1ob)
    )
 )
 
@@ -541,10 +541,10 @@ For reference, the values found in the sets are:
             (int a)
             (int b)
          )
-         (* (- a b) (+ i 1))
+         (* (- b a) (+ i 1))
       )
-      (range 10 40 1)
       (range 0 60 2)
+      (range 10 40 1)
    )
 )
 
@@ -556,10 +556,10 @@ For reference, the values found in the sets are:
             (int a)
             (int b)
          )
-         (* (- a b) (+ i 1))
+         (* (- b a) (+ i 1))
       )
-      (range 10 70 1)
       (range 0 60 2)
+      (range 10 70 1)
    )
 )
 
@@ -571,10 +571,10 @@ For reference, the values found in the sets are:
             (int a)
             (int b)
          )
-         (* (- a b) (+ i 1))
+         (* (- b a) (+ i 1))
       )
-      (range 10 40 1)
       (range 0 80 2)
+      (range 10 40 1)
    )
 )
 
@@ -589,10 +589,10 @@ For reference, the values found in the sets are:
          (int a)
          (int b)
       )
-      (* (- a b) (+ i 1))
+      (* (- b a) (+ i 1))
    )
-   isi1
    (range 0 60 2)
+   isi1
 )
 
 (indexed_merge!
@@ -602,10 +602,10 @@ For reference, the values found in the sets are:
          (int a)
          (int b)
       )
-      (* (- a b) (+ i 1))
+      (* (- b a) (+ i 1))
    )
-   isi1oa
    (range 0 60 2)
+   isi1oa
 )
 
 (indexed_merge!
@@ -615,10 +615,10 @@ For reference, the values found in the sets are:
          (int a)
          (int b)
       )
-      (* (- a b) (+ i 1))
+      (* (- b a) (+ i 1))
    )
-   isi1ob
    (range 0 80 2)
+   isi1ob
 )
 
 (assert
@@ -629,22 +629,22 @@ For reference, the values found in the sets are:
 (for (set i (- (size oracle_set) 1)) (>= i 0) (set i (- i 1))
    (assert
       (=
-         (access oracle_set i)
-         (access isi0 i)
-         (access isi0oa i)
-         (access isi0ob i)
-         (access isi1 i)
-         (access isi1oa i)
-         (access isi1ob i)
+         (access i oracle_set)
+         (access i isi0)
+         (access i isi0oa)
+         (access i isi0ob)
+         (access i isi1)
+         (access i isi1oa)
+         (access i isi1ob)
       )
       [FAILED] (var test_name) Indexed test 1, index (var i), values:
-      Expected: (access oracle_set i);
-      isi0: (access isi0 i);
-      isi0oa: (access isi0oa i);
-      isi0ob: (access isi0ob i);
-      isi1: (access isi1 i);
-      isi1oa: (access isi1oa i);
-      isi1ob: (access isi1ob i);
+      Expected: (access i oracle_set);
+      isi0: (access i isi0);
+      isi0oa: (access i isi0oa);
+      isi0ob: (access i isi0ob);
+      isi1: (access i isi1);
+      isi1oa: (access i isi1oa);
+      isi1ob: (access i isi1ob);
    )
 )
 
@@ -678,10 +678,10 @@ For reference, the values found in the sets are:
             (int b)
             (int mod)
          )
-         (* (* (- a b) mod) (+ i 1))
+         (* (* (- b a) mod) (+ i 1))
       )
-      (range 10 40 1)
       (range 0 60 2)
+      (range 10 40 1)
       -1
    )
 )
@@ -695,10 +695,10 @@ For reference, the values found in the sets are:
             (int b)
             (int mod)
          )
-         (* (* (- a b) mod) (+ i 1))
+         (* (* (- b a) mod) (+ i 1))
       )
-      (range 10 80 1)
       (range 0 60 2)
+      (range 10 80 1)
       -1
    )
 )
@@ -712,10 +712,10 @@ For reference, the values found in the sets are:
             (int b)
             (int mod)
          )
-         (* (- a b) mod (+ i 1))
+         (* (- b a) mod (+ i 1))
       )
-      (range 10 40 1)
       (range 0 80 2)
+      (range 10 40 1)
       -1
    )
 )
@@ -732,10 +732,10 @@ For reference, the values found in the sets are:
          (int b)
          (int mod)
       )
-      (* (- a b) mod (+ i 1))
+      (* (- b a) mod (+ i 1))
    )
-   isi3
    (range 0 60 2)
+   isi3
    -1
 )
 
@@ -747,10 +747,10 @@ For reference, the values found in the sets are:
          (int b)
          (int mod)
       )
-      (* (- a b) mod (+ i 1))
+      (* (- b a) mod (+ i 1))
    )
-   isi3oa
    (range 0 60 2)
+   isi3oa
    -1
 )
 
@@ -762,10 +762,10 @@ For reference, the values found in the sets are:
          (int b)
          (int mod)
       )
-      (* (- a b) mod (+ i 1))
+      (* (- b a) mod (+ i 1))
    )
-   isi3ob
    (range 0 90 2)
+   isi3ob
    -1
 )
 
@@ -777,29 +777,30 @@ For reference, the values found in the sets are:
 (for (set i (- (size oracle_set) 1)) (>= i 0) (set i (- i 1))
    (assert
       (=
-         (access oracle_set i)
-         (access isi2 i)
-         (access isi2oa i)
-         (access isi2ob i)
-         (access isi3 i)
-         (access isi3oa i)
-         (access isi3ob i)
+         (access i oracle_set)
+         (access i isi2)
+         (access i isi2oa)
+         (access i isi2ob)
+         (access i isi3)
+         (access i isi3oa)
+         (access i isi3ob)
       )
       [FAILED] (var test_name) Indexed test 2, index (var i), values:
-      Expected: (access oracle_set i);
-      isi2: (access isi2 i);
-      isi2oa: (access isi2oa i);
-      isi2ob: (access isi2ob i);
-      isi3: (access isi3 i);
-      isi3oa: (access isi3oa i);
-      isi3ob: (access isi3ob i)
+      Expected: (access i oracle_set);
+      isi2: (access i isi2);
+      isi2oa: (access i isi2oa);
+      isi2ob: (access i isi2ob);
+      isi3: (access i isi3);
+      isi3oa: (access i isi3oa);
+      isi3ob: (access i isi3ob)
    )
 )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; DEFAULT_VALUES TEST 0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; SAFE TEST 0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; TODO
+
+(assert (false) [FAILED] TODO: safe merge tests.)
 
 [COMPLETED] (var test_name)
 
-- 
cgit v1.2.3-70-g09d2