Add boolean primitives and more (better) tests

10 files changed, 222 insertions, 43 deletions

diff --git a/Makefile b/Makefile
index afcd918..1a3168b 100755
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ LDLIBS         :=
 RELEASE_CFLAGS := -DNDEBUG -O2
 DEBUG_CFLAGS   := -DDEBUG -O2 -g
 
-.PHONY: tools clean run
+.PHONY: build tests run clean
 
 # Setup debug/release builds.
 #     make clean && make <target> DEBUG=0
@@ -40,14 +40,15 @@ $(BIN): $(SRC_MAIN) $(WATCH_SRC) $(BUILD_DIR)
         $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(SRC_MAIN) $(LDLIBS)
 
 # Create build directory if needed.
-$(BUILD_DIR): tools
+$(BUILD_DIR):
         mkdir -p $(BUILD_DIR)
 
 run: $(BIN)
         ./$(BIN) -i
 
 tests: $(BIN)
-        ./$(BIN) examples/arithmetic.bdl | diff -q tests/arithmetic_expected.txt -
+        ./$(BIN) examples/arithmetic.bdl | diff tests/arithmetic_expected.txt -
+        ./$(BIN) examples/booleans.bdl | diff tests/booleans_expected.txt -
 
 # Remove build directory.
 clean:
diff --git a/examples/arithmetic.bdl b/examples/arithmetic.bdl
index 5e102e9..83404e2 100644
--- a/examples/arithmetic.bdl
+++ b/examples/arithmetic.bdl
@@ -1,22 +1,22 @@
-;
-; Basic arithmetic operations
-;
+;;
+;; Basic arithmetic operations.
+;;
 
-; Addition
-(+ 10 100)
-(+ 1 -2 3 4)
+;; Addition.
+(print "(+ 10 100) -> ") (+ 10 100)
+(print "(+ 1 -2 3 4) -> ") (+ 1 -2 3 4)
 
-; Substraction
-(- 100 75)
-(- 10 20 30)
+;; Substraction.
+(print "(- 100 75) -> ") (- 100 75)
+(print "(- 10 20 30) -> ") (- 10 20 30)
 
-; Multiplication
-(* 10 7)
-(* -1 66)
+;; Multiplication.
+(print "(* 10 7) -> ") (* 10 7)
+(print "(* -1 66) -> ") (* -1 66)
 
-; Division
-(/ 45 5)
-(/ 10 5 2)
+;; Division.
+(print "(/ 45 5) -> ") (/ 45 5)
+(print "(/ 10 5 2) -> ") (/ 10 5 2)
 
-; Nesting operations.
-(* 20 (+ 100 (- 50 30) (/ 300 3)) 10)
+;; Nesting operations.
+(print "(* 20 (+ 100 (- 50 30) (/ 300 3)) 10) -> ") (* 20 (+ 100 (- 50 30) (/ 300 3)) 10)
diff --git a/examples/booleans.bdl b/examples/booleans.bdl
new file mode 100644
index 0000000..d248bf8
--- /dev/null
+++ b/examples/booleans.bdl
@@ -0,0 +1,45 @@
+;;
+;; Boolean primitives.
+;;
+
+;; Boolean test.
+(print "(boolean? true) -> ")   (boolean? true)
+(print "(boolean? false) -> ")   (boolean? false)
+(print "(boolean? 1) -> ")   (boolean? 1)
+(print "(boolean? 5) -> ")   (boolean? 5)
+(print "(boolean? \"string\") -> ") (boolean? "string")
+(print "(boolean? (+ 1 2 3)) -> ")   (boolean? (+ 1 2 3))
+(print "(boolean? (not 1)) -> ")   (boolean? (not 1))
+
+;; Not.
+(print "(not true) -> ")   (not true)
+(print "(not false) -> ")   (not false)
+(print "(not (not true)) -> ")   (not (not true))
+(print "(not (not false)) -> ")   (not (not false))
+(print "(not 1) -> ")   (not 1)
+(print "(not (not 1)) -> ")   (not (not 1))
+(print "(not \"string\") -> ") (not "string")
+(print "(not (not \"string\")) -> ") (not (not "string"))
+
+;; And.
+(print "(and 1 \"string\" 4 true) -> ") (and 1 "string" 4 true)
+(print "(and true true true) -> ")   (and true true true)
+(print "(and (+ 1 2 3)) -> ")   (and (+ 1 2 3))
+(print "(and false false false) -> ")   (and false false false)
+(print "(and true false false) -> ")   (and true false false)
+(print "(and false true false) -> ")   (and false true false)
+(print "(and false true true) -> ")   (and false true true)
+(print "(and (not false) true true) -> ")   (and (not false) true true)
+
+;; Or.
+(print "(or 1 \"string\" 4 true) -> ") (or 1 "string" 4 true)
+(print "(or false 1) -> ")   (or false 1)
+(print "(or false \"string\") -> ") (or false "string")
+(print "(or false) -> ")   (or false)
+(print "(or true true true) -> ")   (or true true true)
+(print "(or false false false) -> ")   (or false false false)
+(print "(or true false false) -> ")   (or true false false)
+(print "(or false true false) -> ")   (or false true false)
+(print "(or false true true) -> ")   (or false true true)
+(print "(or (not false) true true) -> ")   (or (not false) true true)
+(print "(or (not true) false) -> ")   (or (not true) false)
diff --git a/src/bootstrap/lexer.c b/src/bootstrap/lexer.c
index dd5c0f2..b03db77 100644
--- a/src/bootstrap/lexer.c
+++ b/src/bootstrap/lexer.c
@@ -51,7 +51,7 @@ Tokens
 tokenize(StringView sv) {
     // NOTE: Not allocating any memory for now, but we are limited by a maximum
     // number of tokens we can process.
-    #define TOKENS_BUF_SIZE 1024
+    #define TOKENS_BUF_SIZE KB(64)
     static Token tokens_buf[TOKENS_BUF_SIZE];
 
     // Clear buffer.
diff --git a/src/bootstrap/main.c b/src/bootstrap/main.c
index 95b2e49..a8ba7bc 100755
--- a/src/bootstrap/main.c
+++ b/src/bootstrap/main.c
@@ -37,8 +37,11 @@ init(void) {
     environment[env_n++] = (EnvSymbol){MAKE_SYM("*"), make_procedure(proc_mul)};
     environment[env_n++] = (EnvSymbol){MAKE_SYM("/"), make_procedure(proc_div)};
     environment[env_n++] = (EnvSymbol){MAKE_SYM("boolean?"), make_procedure(proc_is_boolean)};
-    environment[env_n++] = (EnvSymbol){MAKE_SYM("false?"), make_procedure(proc_is_false)};
+    environment[env_n++] = (EnvSymbol){MAKE_SYM("not"), make_procedure(proc_not)};
+    environment[env_n++] = (EnvSymbol){MAKE_SYM("and"), make_procedure(proc_and)};
+    environment[env_n++] = (EnvSymbol){MAKE_SYM("or"), make_procedure(proc_or)};
     environment[env_n++] = (EnvSymbol){MAKE_SYM("display"), make_procedure(proc_display)};
+    environment[env_n++] = (EnvSymbol){MAKE_SYM("print"), make_procedure(proc_print)};
 }
 
 void
@@ -64,8 +67,9 @@ eval_line(FILE *fd, char delimiter) {
             printf("\n");
             printf("EVAL: ");
 #endif
-            display(eval(ast));
-            printf("\n");
+            if (display(eval(ast))) {
+                printf("\n");
+            };
         }
     }
 }
diff --git a/src/bootstrap/primitives.c b/src/bootstrap/primitives.c
index e4c18cd..97058f9 100644
--- a/src/bootstrap/primitives.c
+++ b/src/bootstrap/primitives.c
@@ -1,4 +1,4 @@
-void display(Object *root);
+bool display(Object *root);
 
 void
 display_pair(Object *root) {
@@ -6,7 +6,7 @@ display_pair(Object *root) {
     if (root->cdr->type == OBJ_TYPE_PAIR) {
         printf(" ");
         display_pair(root->cdr);
-    } else if (root->cdr->type == OBJ_TYPE_NIL) {
+    } else if (root->cdr == obj_nil) {
         return;
     } else {
         printf(" . ");
@@ -14,10 +14,10 @@ display_pair(Object *root) {
     }
 }
 
-void
+bool
 display(Object *root) {
     if (root == NULL) {
-        return;
+        return false;
     }
 
     switch (root->type) {
@@ -49,6 +49,7 @@ display(Object *root) {
             printf("#{procedure}");
         } break;
     }
+    return true;
 }
 
 Object *
@@ -223,14 +224,90 @@ proc_display(Object *args) {
 }
 
 Object *
+proc_print(Object *args) {
+    if (args == NULL) {
+        return NULL;
+    }
+    if (args->type == OBJ_TYPE_PAIR) {
+        Object *obj = args->car;
+        if (obj->type == OBJ_TYPE_STRING) {
+            StringView scanner = (StringView) {
+                .start = obj->string,
+                .n = obj->string_n,
+            };
+            while (scanner.n != 0) {
+                char c = sv_next(&scanner);
+                if (c == '\\' && sv_peek(&scanner) == 'n') {
+                    putchar('\n');
+                    sv_next(&scanner);
+                    continue;
+                }
+                if (c == '\\' && sv_peek(&scanner) == '"') {
+                    putchar('"');
+                    sv_next(&scanner);
+                    continue;
+                }
+                putchar(c);
+            }
+        } else {
+            fprintf(stderr, "error: print requires a string argument\n");
+        }
+    }
+    return NULL;
+}
+
+Object *
 proc_is_boolean(Object *args) {
-    if (args->car == obj_true || args->car == obj_false) {
-        return obj_true;
+    Object *obj = NULL;
+    if (args->type == OBJ_TYPE_PAIR) {
+        obj = eval(args->car);
+    } else {
+        obj = eval(args);
     }
-    return obj_false;
+    return (obj == obj_true || obj == obj_false) ? obj_true : obj_false;
+}
+
+Object *
+proc_not(Object *args) {
+    if (args->type == OBJ_TYPE_PAIR) {
+        return eval(args->car) == obj_false ? obj_true : obj_false;
+    }
+    return eval(args) == obj_false ? obj_true : obj_false;
+}
+
+Object *
+proc_and(Object *args) {
+    while (args != NULL && args != obj_nil) {
+        Object *obj = args->car;
+        if (args->car->type == OBJ_TYPE_PAIR) {
+            obj = eval(args->car);
+        }
+        if (proc_not(obj) == obj_true) {
+            return obj_false;
+        }
+        args = args->cdr;
+    }
+    return obj_true;
 }
 
 Object *
-proc_is_false(Object *args) {
-    return args->car == obj_false ? obj_true : obj_false;
+proc_or(Object *args) {
+    if (args->type != OBJ_TYPE_PAIR) {
+        return obj_false;
+    }
+
+    while (args != NULL && args != obj_nil) {
+        Object *obj = args->car;
+        if (args->car->type == OBJ_TYPE_PAIR) {
+            obj = eval(args->car);
+        }
+        if (proc_not(obj) == obj_false) {
+            return obj_true;
+        }
+        args = args->cdr;
+    }
+    return obj_false;
 }
+
+// TODO: if/cond
+// TODO: fixnum left/right shift, mask, invert
diff --git a/src/bootstrap/readline.c b/src/bootstrap/readline.c
index dfd8285..ae03e4a 100644
--- a/src/bootstrap/readline.c
+++ b/src/bootstrap/readline.c
@@ -2,7 +2,7 @@
 
 StringView
 read_line(FILE *fd, char delimiter) {
-    #define RL_BUF_SIZE 1024
+    #define RL_BUF_SIZE KB(64)
     static char readline_buf[RL_BUF_SIZE];
 
     // Clear buffer.
diff --git a/src/bootstrap/string_view.c b/src/bootstrap/string_view.c
index 3cf275a..e958a46 100644
--- a/src/bootstrap/string_view.c
+++ b/src/bootstrap/string_view.c
@@ -23,3 +23,21 @@ sv_equal(StringView a, StringView b) {
     return false;
 }
 
+char
+sv_next(StringView *sv) {
+    if (sv->n == 0) {
+        return '\0';
+    }
+    char ret = sv->start[0];
+    sv->start++;
+    sv->n--;
+    return ret;
+}
+
+char
+sv_peek(const StringView *sv) {
+    if (sv->n == 0) {
+        return '\0';
+    }
+    return sv->start[0];
+}
diff --git a/tests/arithmetic_expected.txt b/tests/arithmetic_expected.txt
index 590166a..16445dc 100644
--- a/tests/arithmetic_expected.txt
+++ b/tests/arithmetic_expected.txt
@@ -1,9 +1,9 @@
-110
-6
-25
--40
-70
--66
-9
-1
-44000
+(+ 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
+(* 20 (+ 100 (- 50 30) (/ 300 3)) 10) -> 44000
diff --git a/tests/booleans_expected.txt b/tests/booleans_expected.txt
new file mode 100644
index 0000000..81f0313
--- /dev/null
+++ b/tests/booleans_expected.txt
@@ -0,0 +1,34 @@
+(boolean? true) -> true
+(boolean? false) -> true
+(boolean? 1) -> false
+(boolean? 5) -> false
+(boolean? "string") -> false
+(boolean? (+ 1 2 3)) -> false
+(boolean? (not 1)) -> true
+(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