Merge pull request #67 from bksaiki/environments

Top-level environments
bksaiki · Apr 19, 2024 · b0ae25a · b0ae25a
2 parents 18aac51 + c891ea3
commit b0ae25a
Show file tree

Hide file tree

Showing 21 changed files with 438 additions and 234 deletions.
diff --git a/src/boot/c/boot.c b/src/boot/c/boot.c
@@ -17,6 +17,5 @@ void minim_boot_init() {
     tc_stack_size(tc) = stack_size;
     tc_sfp(tc) = tc_stack_base(tc);
     tc_esp(tc) = tc_sfp(tc) + tc_stack_size(tc) - stack_slop;
-    tc_env(tc) = make_env();
     current_tc() = tc;
 }
diff --git a/src/boot/c/minim.c b/src/boot/c/minim.c
@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
 
     // load the prelude
     tc = current_tc();
-    load_prelude(tc_env(tc));
+    load_prelude(tc);
 
     if (opt_load_library)
         load_library();

diff --git a/src/boot/s/boot.min b/src/boot/s/boot.min
diff --git a/src/boot/test/jit.c b/src/boot/test/jit.c
@@ -42,7 +42,7 @@ void no_check(const char *input) {
     istream = tmpfile();
     tc = current_tc();
     load(istream, input);
-    tc_env(tc) = make_env();
+    tc_env(tc) = make_base_env();
     eval_expr(tc, read_object(istream));
 }
 
@@ -53,7 +53,7 @@ void check_true(const char *input) {
     istream = tmpfile();
     tc = current_tc();
     load(istream, input);
-    tc_env(tc) = make_env();
+    tc_env(tc) = make_base_env();
     result = eval_expr(tc, read_object(istream));
     if (!minim_truep(result)) {
         log_failed_case(input, "#t", write(result));
@@ -70,7 +70,7 @@ void check_false(const char *input) {
     istream = tmpfile();
     tc = current_tc();
     load(istream, input);
-    tc_env(tc) = make_env();
+    tc_env(tc) = make_base_env();
     result = eval_expr(tc, read_object(istream));
     if (!minim_falsep(result)) {
         log_failed_case(input, "#f", write(result));
@@ -88,7 +88,7 @@ void check_equal(const char *input, const char *expect) {
     istream = tmpfile();
     tc = current_tc();
     load(istream, input);
-    tc_env(tc) = make_env();
+    tc_env(tc) = make_base_env();
     result = eval_expr(tc, read_object(istream));
     str = write(result);
     if (strcmp(str, expect) != 0) {

diff --git a/src/boot/test/prims.c b/src/boot/test/prims.c
@@ -40,22 +40,15 @@ char *write(mobj o) {
     printf(" %s => expected: %s, actual: %s\n", s, expect, actual); \
 }
 
-void no_check(const char *input) {
-    FILE *istream;
-
-    istream = tmpfile();
-    load(istream, input);
-    eval_expr(read_object(istream), make_env());
-}
-
 void check_true(const char *input) {
     FILE *istream;
     mobj tc, result;
 
     istream = tmpfile();
     tc = current_tc();
     load(istream, input);
-    tc_env(tc) = make_env();
+    tc_tenv(tc) = make_base_env();
+    tc_env(tc) = tc_tenv(tc);
     result = eval_expr(tc, read_object(istream));
     if (!minim_truep(result)) {
         log_failed_case(input, "#t", write(result));
@@ -72,7 +65,8 @@ void check_false(const char *input) {
     istream = tmpfile();
     tc = current_tc();
     load(istream, input);
-    tc_env(tc) = make_env();
+    tc_tenv(tc) = make_base_env();
+    tc_env(tc) = tc_tenv(tc);
     result = eval_expr(tc, read_object(istream));
     if (!minim_falsep(result)) {
         log_failed_case(input, "#f", write(result));
@@ -90,7 +84,8 @@ void check_equal(const char *input, const char *expect) {
     istream = tmpfile();
     tc = current_tc();
     load(istream, input);
-    tc_env(tc) = make_env();
+    tc_tenv(tc) = make_base_env();
+    tc_env(tc) = tc_tenv(tc);
     result = eval_expr(tc, read_object(istream));
     str = write(result);
     if (strcmp(str, expect) != 0) {