Add support for accessing procedure parameters

1 files changed, 23 insertions, 5 deletions

diff --git a/src/parser.c b/src/parser.c
index 2bf95d4..5bb7393 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -429,9 +429,9 @@ parse_tree(Parser *parser, Errors *errors) {
 }
 
 ssize_t
-find_local_index(Object **locals, Object *symbol) {
-    for (size_t i = 0; i < array_size(locals); i++) {
-        if (object_equal(locals[i], symbol)) {
+find_var_index(Object **vars, Object *symbol) {
+    for (size_t i = 0; i < array_size(vars); i++) {
+        if (object_equal(vars[i], symbol)) {
             return i;
         }
     }
@@ -441,10 +441,14 @@ find_local_index(Object **locals, Object *symbol) {
 Object *
 symbol_in_env(Environment *env, Object *symbol) {
     while (env != NULL) {
-        ssize_t idx = find_local_index(env->locals, symbol);
+        ssize_t idx = find_var_index(env->locals, symbol);
         if (idx != -1) {
             return env->locals[idx];
         }
+        idx = find_var_index(env->params, symbol);
+        if (idx != -1) {
+            return env->params[idx];
+        }
         env = env->parent;
     }
     return NULL;
@@ -452,13 +456,21 @@ symbol_in_env(Environment *env, Object *symbol) {
 
 void
 insert_local(Environment *env, Object *symbol) {
-    if (find_local_index(env->locals, symbol) != -1) {
+    if (find_var_index(env->locals, symbol) != -1) {
         return;
     }
     array_push(env->locals, symbol);
 }
 
 void
+insert_params(Environment *env, Object *symbol) {
+    if (find_var_index(env->params, symbol) != -1) {
+        return;
+    }
+    array_push(env->params, symbol);
+}
+
+void
 semantic_analysis(Environment *env, Object *obj, Errors *errors) {
     if (obj == NULL || obj->visited) {
         return;
@@ -523,6 +535,9 @@ semantic_analysis(Environment *env, Object *obj, Errors *errors) {
             // Initialize scope for this lambda.
             Environment *new_env = env_alloc(env);
             obj->env = new_env;
+            for (size_t i = 0; i < array_size(obj->params); i++) {
+                insert_params(obj->env, obj->params[i]);
+            }
             // Used for removing unnecessary statements.
             Object **new_body = NULL;
             array_init(new_body, 0);
@@ -622,7 +637,9 @@ Environment *
 env_alloc(Environment *parent) {
     Environment *env = malloc(sizeof(Environment));
     env->locals = NULL;
+    env->params = NULL;
     array_init(env->locals, 0);
+    array_init(env->params, 0);
     env->parent = parent;
     array_push(environments, env);
     return env;
@@ -663,6 +680,7 @@ free_objects(void) {
         for (size_t i = 0; i < array_size(environments); i++) {
             Environment *env = environments[i];
             array_free(env->locals);
+            array_free(env->params);
             free(env);
         }
         array_free(environments);