From 6aec0ce0fb005457b53633b9599998117a1003cf Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Tue, 25 Aug 2020 23:39:46 +0200 Subject: Woops, forgot to change some booleans. --- data/tests/conditionals.fate | 2 +- data/tests/operators.fate | 6 +++--- src/core/src/tonkadur/wyrd/v1/lang/type/Type.java | 2 +- 3 files changed, 5 insertions(+), 5 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 diff --git a/src/core/src/tonkadur/wyrd/v1/lang/type/Type.java b/src/core/src/tonkadur/wyrd/v1/lang/type/Type.java index ce1f4fe..d123104 100644 --- a/src/core/src/tonkadur/wyrd/v1/lang/type/Type.java +++ b/src/core/src/tonkadur/wyrd/v1/lang/type/Type.java @@ -10,7 +10,7 @@ public class Type static { - BOOL = new Type("boolean"); + BOOL = new Type("bool"); FLOAT = new Type("float"); INT = new Type("int"); RICH_TEXT = new Type("rich_text"); -- cgit v1.2.3-70-g09d2