Add let/set/struct parsing

8 files changed, 57 insertions, 205 deletions

diff --git a/tests/arithmetic_expected.txt b/tests/arithmetic_expected.txt
deleted file mode 100644
index a2a5a83..0000000
--- a/tests/arithmetic_expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-(+ 10 100) -> 110
-(+ 1 -2 3 4) -> 6
-(- 100 75) -> 25
-(- 10 20 30) -> -40
-(* 10 7) -> 70
-(* -1 66) -> -66
-(/ 45 5) -> 9
-(/ 10 5 2) -> 1
-(% 45 5) -> 0
-(% 45 7) -> 3
-(% 120 45) -> 30
-(% 120 45 8) -> 6
-(* 20 (+ 100 (- 50 30) (/ 300 3)) 10) -> 44000
diff --git a/tests/booleans_expected.txt b/tests/booleans_expected.txt
deleted file mode 100644
index 43f67e5..0000000
--- a/tests/booleans_expected.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-(not true) -> false
-(not false) -> true
-(not (not true)) -> true
-(not (not false)) -> false
-(not 1) -> false
-(not (not 1)) -> true
-(not "string") -> false
-(not (not "string")) -> true
-(and 1 "string" 4 true) -> true
-(and true true true) -> true
-(and (+ 1 2 3)) -> true
-(and false false false) -> false
-(and true false false) -> false
-(and false true false) -> false
-(and false true true) -> false
-(and (not false) true true) -> true
-(or 1 "string" 4 true) -> true
-(or false 1) -> true
-(or false "string") -> true
-(or false) -> false
-(or true true true) -> true
-(or false false false) -> false
-(or true false false) -> true
-(or false true false) -> true
-(or false true true) -> true
-(or (not false) true true) -> true
-(or (not true) false) -> false
-(if true true false) -> true
-(if false true false) -> false
-(if true (+ 1 2 3) 0) -> 6
-(if false (+ 1 2 3) 0) -> 0
-(if (or true false) (+ 1 2 3) (+ 7 8 9)) -> 6
-(if (or false false) (+ 1 2 3) (+ 7 8 9)) -> 24
-(if (or (+ 1 2 3) false) (+ 1 2 3) (+ 7 8 9)) -> 6
-(if true 7) -> 7
-(if false 7) -> 
-(cond ((and true true true) 1) ((or true true false) 2) (else 3)) -> 1
-(cond ((and true true false) 1) ((or true true false) 2) (else 3)) -> 2
-(cond ((and true true false) 1) ((or false false false) 2) (else 3)) -> 3
-(cond ((and true true true) 1) ((or true true false) 2)) -> 
-(cond ((and true true true) (+ 1 2 3)) ((or true true false) 2) (else 3)) -> 6
-(< 1 2 3) -> true
-(< 3 2 1) -> false
-(> 1 2 3) -> false
-(> 3 2 1) -> true
-(= 1 2 3) -> false
-(= 3 2 1) -> false
-(= 3 3 3) -> true
-(= (+ 1 2) 3 (- 6 3)) -> true
-(< 1 1 3) -> false
-(<= 1 1 3) -> true
-(> 3 3 1) -> false
-(>= 3 3 1) -> true
diff --git a/tests/constants/numbers.bdl b/tests/constants/numbers.bdl
deleted file mode 100644
index 136b5fb..0000000
--- a/tests/constants/numbers.bdl
+++ /dev/null
@@ -1,41 +0,0 @@
-; Signed integers.
-(print 1:s8)
-(print 52:s8)
-(print -1:s8)
-(print 0:s8)
-(print 1:s16)
-(print 52:s16)
-(print -1:s16)
-(print 0:s16)
-(print 1:s32)
-(print 52:s32)
-(print -1:s32)
-(print 0:s32)
-(print 1:s64)
-(print 52:s64)
-(print -1:s64)
-(print 0:s64)
-
-; Unsigned integers.
-(print 1:u8)
-(print 52:u8)
-(print -1:u8)
-(print 0:u8)
-(print 1:u16)
-(print 52:u16)
-(print -1:u16)
-(print 0:u16)
-(print 1:u32)
-(print 52:u32)
-(print -1:u32)
-(print 0:u32)
-(print 1:u64)
-(print 52:u64)
-(print -1:u64)
-(print 0:u64)
-
-; Type inference.
-(print 1)
-(print 52)
-(print -1)
-(print 0)
diff --git a/tests/constants/strings.bdl b/tests/constants/strings.bdl
deleted file mode 100644
index 9b1d687..0000000
--- a/tests/constants/strings.bdl
+++ /dev/null
@@ -1,5 +0,0 @@
-(print "abc")
-(print "test this longer string")
-(print "escape\na\nnewline")
-(print "escape\ttab\tcharacters")
-(print "with type :str":str)
diff --git a/tests/lists_expected.txt b/tests/lists_expected.txt
deleted file mode 100644
index 6ddb71b..0000000
--- a/tests/lists_expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-(list) -> 
-(list 1) -> (1)
-(list 1 2) -> (1 2)
-(list 1 2 3) -> (1 2 3)
-(list 4 5 (+ 1 2 3)) -> (4 5 6)
-(car (list 1 2 3)) -> 1
-(cdr (list 1 2 3)) -> (2 3)
-(car (list (* 10 20) (+ 1 2 3) 50 60)) -> 200
-(cdr (list (* 10 20) (+ 1 2 3) 50 60)) -> (6 50 60)
-(car (cdr (list (* 10 20) (+ 1 2 3) 50 60))) -> 6
-(cons 1 2) -> (1 . 2)
-(cons "a" "b") -> ("a" . "b")
-(cons "a" (cons "c" ())) -> ("a" "c")
-(cons 1 (cons 2 (cons (+ 1 2) ()))) -> (1 2 3)
-(cons 1 (cons 2 (cons (+ 1 2) 4))) -> (1 2 3 . 4)
diff --git a/tests/types_expected.txt b/tests/types_expected.txt
deleted file mode 100644
index 58eaa7f..0000000
--- a/tests/types_expected.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-(boolean? true) -> true
-(boolean? false) -> true
-(boolean? 1) -> false
-(boolean? 5) -> false
-(boolean? "string") -> false
-(boolean? (+ 1 2 3)) -> false
-(boolean? (not 1)) -> true
-(nil? true) -> false
-(nil? false) -> false
-(nil? 1) -> false
-(nil? 5) -> false
-(nil? "string") -> false
-(nil? (+ 1 2 3)) -> false
-(nil? (not 1)) -> false
-(nil? ()) -> true
-(string? true) -> false
-(string? false) -> false
-(string? 1) -> false
-(string? 5) -> false
-(string? "string") -> true
-(string? (+ 1 2 3)) -> false
-(string? (not 1)) -> false
-(fixnum? true) -> false
-(fixnum? false) -> false
-(fixnum? 1) -> true
-(fixnum? 5) -> true
-(fixnum? "string") -> false
-(fixnum? (+ 1 2 3)) -> true
-(fixnum? (not 1)) -> false
-(symbol? true) -> false
-(symbol? false) -> false
-(symbol? 1) -> false
-(symbol? +) -> false
-(symbol? "string") -> false
-(symbol? (+ 1 2 3)) -> false
-(symbol? (not 1)) -> false
-(symbol? 'a) -> true
-(symbol? 'c) -> true
-(pair? false) -> false
-(pair? 1) -> false
-(pair? 5) -> false
-(pair? "string") -> false
-(pair? (+ 1 2 3)) -> false
-(pair? (not 1)) -> false
-(pair? (cons 1 2)) -> true
-(pair? (list 1 2 3)) -> true
-(procedure? false) -> false
-(procedure? 1) -> false
-(procedure? 5) -> false
-(procedure? "string") -> false
-(procedure? (+ 1 2 3)) -> false
-(procedure? (not 1)) -> false
-(procedure? +) -> true
-(procedure? -) -> true
-(procedure? procedure?) -> true
diff --git a/tests/variables.bad b/tests/variables.bad
new file mode 100644
index 0000000..a6f9900
--- /dev/null
+++ b/tests/variables.bad
@@ -0,0 +1,57 @@
+; Basic variable declaration with and without default values. The type could be
+; inferred, but can also be manually specified.
+let a
+let b: f64
+let c = 10
+let d:u64 = 20
+
+; No infix '=', instead we use `set` to bind values.
+set a = "hello"
+set b = 1.2
+set c = 30
+set d = (1 + 2 - 3)
+
+; Struct definitions.
+struct vec {
+    x: f32
+    y: f32
+    z: f32
+}
+
+; Default values are allowed, including const expressions.
+struct person {
+    name: str = "joe"
+    age: int = 18 * 2
+}
+
+; We can use the dot operator to access fields.
+let player_a: person
+set player_a.name = "alex"
+set player_a.age = 32
+let player_b = player_a
+
+; Anonymous structs can also be declared inline.
+let user: { id: u64 name: str }
+set user.id = 10
+set user.name = "haxor"
+
+; We can have anonymous struct fields.
+struct entity {
+    pos: vec
+    vel: vec
+    attr: {
+        id: u64
+        name: str
+    }
+}
+
+; Symbols followed by curly braces output struct literals.
+; let particle = entity {
+;     ; Two ways of initializing inner fields.
+;     pos = { 1 2 }
+;     attr.id = 1
+;     attr.name = "particle"
+
+;     ; Missing initialization fields default to zero.
+;     vel = { -3 }
+; }
diff --git a/tests/variables_expected.txt b/tests/variables_expected.txt
deleted file mode 100644
index 02a5f7a..0000000
--- a/tests/variables_expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-(def a 20)
-((lambda (a b) (+ 10 a b)) 1 2) -> 13
-((lambda (a b) (+ 10 a b)) a 3) -> 33
-(def myfun (lambda (a b) (+ a b))) (myfun 6 9) -> 15
-(fun myfun (a b) (+ a b)) (myfun 6 9) -> 15
-(+ 1 (myfun 10 (myfun a a)) 30) -> 81
-(myfun 10 (myfun 5 0)) -> 15
-(fun make-counter () (def value 0) (def counter (lambda () (set! value (+ value 1)) value)) counter)
-(def counter-a (make-counter))
-(def counter-b (make-counter))
-(counter-a) -> 1
-(counter-b) -> 1
-(counter-a) -> 2
-(counter-a) -> 3
-(counter-a) -> 4
-(counter-b) -> 2
-(counter-b) -> 3
-(counter-b) -> 4
-(fun fib (n) (if (<= n 2) 1 (+ (fib (- n 1)) (fib (- n 2)))))
-(fib 15) -> 610
-(fun b () (display a) (print " --- ") (def a 42) (display a) (newline))
-(b) -> 20 --- 42
-(b) -> 20 --- 42