Merge branch 'master' of dreamhost:~/repositories/git/tonkadur

2 files changed, 4 insertions, 4 deletions

diff --git a/data/tests/conditionals.fate b/data/tests/conditionals.fate
index 0728cbc..e7f0f08 100644
--- a/data/tests/conditionals.fate
+++ b/data/tests/conditionals.fate
@@ -198,7 +198,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; INSTRUCTIONS ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(global boolean test_var)
+(global bool test_var)
 (set test_var (true))
 
 (assert (var test_var) FAILED: setting test_var)
diff --git a/data/tests/operators.fate b/data/tests/operators.fate
index 6598297..de775d9 100644
--- a/data/tests/operators.fate
+++ b/data/tests/operators.fate
@@ -4,17 +4,17 @@
 (assert (= 1 1) FAILED: int equality)
 (assert (= 1.0 1.0) FAILED: float equality)
 (assert (= test test) FAILED: string equality)
-(assert (= (true) (true)) FAILED: boolean equality)
+(assert (= (true) (true)) FAILED: bool equality)
 
 (assert (= (= 1 2) (false)) FAILED: int inequality)
 (assert (= (= 1.0 2.0) (false)) FAILED: float inequality)
 (assert (= (= one two) (false)) FAILED: string inequality)
-(assert (= (= (true) (false)) (false)) FAILED: boolean inequality)
+(assert (= (= (true) (false)) (false)) FAILED: bool inequality)
 
 (assert (= 1 1 1 1 1) FAILED: int n>2 equality)
 (assert (= 1.0 1.0 1.0 1.0 1.0) FAILED: float n>2 equality)
 (assert (= test test test test test) FAILED: string n>2 equality)
-(assert (= (true) (true) (true) (true)) FAILED: boolean n>2 equality)
+(assert (= (true) (true) (true) (true)) FAILED: bool n>2 equality)
 
 
 ;; ADDITION