Ensure lambdas wrap their env tables

2 files changed, 10 insertions, 7 deletions

diff --git a/src/parser.c b/src/parser.c
index d1a5e7a..59e8075 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -91,6 +91,7 @@ parse_lambda(Parser *parser, Errors *errors) {
     Object *lambda = object_alloc(start, OBJ_TYPE_LAMBDA);
     array_init(lambda->params, 0);
     array_init(lambda->body, 0);
+    lambda->env = NULL;
 
     // Parse parameters.
     Token tok = next_token(parser);
@@ -450,6 +451,7 @@ check_object_scope(Environment *env, Object *obj, Errors *errors) {
         } break;
         case OBJ_TYPE_LAMBDA: {
             Environment *new_env = env_alloc(env);
+            obj->env = new_env;
             for (size_t i = 0; i < array_size(obj->body); i++) {
                 Object *expr = obj->body[i];
                 check_object_scope(new_env, expr, errors);
@@ -488,7 +490,7 @@ remove_unused_expr(Object *obj) {
                         IS_STRING(expr) ||
                         IS_SYMBOL(expr) ||
                         IS_LAMBDA(expr) ||
-                        IS_BOOL(expr)   ||
+                        IS_BOOL(expr) ||
                         IS_NIL(expr)) {
                         continue;
                     }
@@ -556,7 +558,7 @@ parse(Token *tokens, Errors *errors) {
                 IS_STRING(root) ||
                 IS_SYMBOL(root) ||
                 IS_LAMBDA(root) ||
-                IS_BOOL(root)   ||
+                IS_BOOL(root) ||
                 IS_NIL(root)) {
                 continue;
             }
diff --git a/src/parser.h b/src/parser.h
index 01f53b0..fa8858e 100755
--- a/src/parser.h
+++ b/src/parser.h
@@ -4,6 +4,11 @@
 #include "lexer.h"
 #include "hashtable.h"
 
+typedef struct Environment {
+    HashTable *table;
+    struct Environment *parent;
+} Environment;
+
 typedef enum ObjectType {
     OBJ_TYPE_NIL,
     OBJ_TYPE_TRUE,
@@ -38,6 +43,7 @@ typedef struct Object {
          struct {
              struct Object **params;
              struct Object **body;
+             Environment *env;
          };
 
          // OBJ_TYPE_IF
@@ -59,11 +65,6 @@ typedef struct Object {
     size_t col;
 } Object;
 
-typedef struct Environment {
-    HashTable *table;
-    struct Environment *parent;
-} Environment;
-
 typedef struct Parser {
     Token *tokens;
     size_t current;