summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-08-25 23:39:46 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-08-25 23:39:46 +0200
commit6aec0ce0fb005457b53633b9599998117a1003cf (patch)
treeb7ddd0b6512876c8a8351e473849170cecb10268
parent8f1702278c55cb2f55ef7ca7d26d46e96ceffd73 (diff)
Woops, forgot to change some booleans.
-rw-r--r--data/tests/conditionals.fate2
-rw-r--r--data/tests/operators.fate6
-rw-r--r--src/core/src/tonkadur/wyrd/v1/lang/type/Type.java2
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");