push from mac

cw/main.c

@@ -169,8 +169,6 @@ void add_function_to_env(NODE *tree, ENV *env_ptr) {
   NODE* func_name = tree->left->right->left->left;
   TOKEN* name_token = (TOKEN*) func_name;
   if ((existing = find_name_in_env(name_token, env_ptr)) == NULL) {
-    /* printf("Added function name %s to environment with value: \n", name_token->lexeme); */
-    /* print_tree(tree); */
     ENV* new_func_env = create_new_function_env(env_ptr);
     if (tree->left->right->right != NULL) {
       add_args_to_env(tree->left->right->right, new_func_env);
@@ -210,7 +208,7 @@ TOKEN** get_val_list(NODE *tree) {
 void bind_arg(TOKEN* val, TOKEN* arg_name, ENV *env_ptr) {
   BIND* existing = find_name_in_list(arg_name, env_ptr->bindings);
   if (existing == NULL) {
-    printf("fatal error\n");
+    printf("Attempted to bind arg that doesn't exist, the compiler is broken\n");
     exit(1);
   }
   existing->tree = (NODE*) val;
@@ -224,14 +222,12 @@ void add_var_to_env(NODE *tree, ENV *env_ptr) {
   tok->value = recursive_interpret(tree->right, env_ptr);
   asprintf(&tok->lexeme, "%d", tok->value);
   if ((existing = find_name_in_env(name_token, env_ptr)) == NULL) {
-    /* printf("Added variable name %s to environment with value: %s\n", name_token->lexeme, tok->lexeme); */
     if (env_ptr->bindings == NULL) {
       env_ptr->bindings = create_list(create_binding(name_token, (NODE*) tok, NULL), NULL);
     } else {
       append_list(env_ptr->bindings, create_binding(name_token, (NODE*) tok, NULL));
     }
   } else {
-    /* printf("Updating variable name %s with value: %s\n", name_token->lexeme, tok->lexeme); */
     existing->tree = (NODE *) tok;
   } 
 }
@@ -282,10 +278,10 @@ int recursive_interpret(NODE *tree, ENV *env_ptr) {
       exit(1);
     }
     if (tree->right != NULL) {
-      TOKEN** arg_list;
-      TOKEN** val_list;
-      int exp_args = count_args(func->tree->left->right->right);
-      int num_args = count_args(tree->right);
+      TOKEN **arg_list, **val_list;
+      int exp_args, num_args;
+      exp_args = count_args(func->tree->left->right->right);
+      num_args = count_args(tree->right);
       arg_list = get_argument_list(func->tree);
       val_list = get_val_list(tree->right);
       if (exp_args == num_args) {
@@ -293,7 +289,7 @@ int recursive_interpret(NODE *tree, ENV *env_ptr) {
           bind_arg(val_list[i], arg_list[i], func->env);
         }
       } else {
-        printf("Error! Arguments not right!!\n");
+        printf("Incorrect arguments passed to function %s, expected %d got %d\n", func_name->lexeme, exp_args, num_args);
         exit(1);
       }
     }
@@ -301,14 +297,16 @@ int recursive_interpret(NODE *tree, ENV *env_ptr) {
   }
   if (tree->type == IF) {
     if (recursive_interpret(tree->left, env_ptr) == 1) {
+      ENV* scope_env = create_new_function_env(env_ptr);
       if (tree->right->type == ELSE) {
-        return recursive_interpret(tree->right->left, env_ptr);
+        return recursive_interpret(tree->right->left, scope_env);
       } else {
-        return recursive_interpret(tree->right, env_ptr);
+        return recursive_interpret(tree->right, scope_env);
       }
     } else {
       if (tree->right->type == ELSE) {
-        return recursive_interpret(tree->right->right, env_ptr);
+        ENV* scope_env = create_new_function_env(env_ptr);
+        return recursive_interpret(tree->right->right, scope_env);
       }
       return 0;
     }
@@ -358,8 +356,9 @@ int recursive_interpret(NODE *tree, ENV *env_ptr) {
     return recursive_interpret(tree->left, env_ptr);
   }
   if (tree->type == WHILE) {
+    ENV* scope_env = create_new_function_env(env_ptr);
     while (recursive_interpret(tree->left, env_ptr)) {
-      recursive_interpret(tree->right, env_ptr);
+      recursive_interpret(tree->right, scope_env);
     }
     return 0;
   }

cw/simple.c

@@ -1,20 +1,20 @@
-int y = 0;
-
-int incr_y(int a, int b) {
-  y = y + a + b;
+int sum(int a, int b, int c) {
+  int y = 0;
+  if (a > 2) {
+    int x = 3;
+    y = x;
+  }
+  return y + b + c;
 }
 
-int blah() {
-  y = 2;
+int fact(int n) {
+  int inner_fact(int n, int a) {
+    if (n == 0) return a;
+    return inner_fact(n-1, a*n);
+  }
+  return inner_fact(n, 1);
 }
 
-/* int blah2(int a, int b, int c, int d) {} */
-
-/* int blah3(int a) {} */
-
 int main() {
-  incr_y(2,3);
-  incr_y(4, 5);
-
-  return y;
+  return fact(3);
 }

cw/tests/test.sh

@@ -1,6 +1,14 @@
 #/bin/bash
-start=$(date +%s.%N)
-absdir=$(readlink -f $(dirname $0))
+uname=`uname`
+if [[ "$uname" -eq "Darwin" ]]; then
+  date="gdate"
+  readlink="greadlink"
+else
+  date="date"
+  readlink="readlink"
+fi
+start=$($date +%s.%N)
+absdir=$($readlink -f $(dirname $0))
 ret_only=`$absdir/../mycc < $absdir/return_only.c | tail -n 1`
 var_maths=`$absdir/../mycc < $absdir/var_maths.c | tail -n 1`
 func_call=`$absdir/../mycc < $absdir/func_call.c | tail -n 1`
@@ -18,35 +26,35 @@ overall='0'
 pass="\033[32mPASSED\033[0m"
 fail="\033[31mFAILED\033[0m"
 
-if [ "$ret_only" -eq $ret_ans ]; then
+if [[ "$ret_only" -eq $ret_ans ]]; then
   echo "return_only ... $pass"
 else
   echo -n "return_only ... $fail"
   echo " expected $ret_ans but got $ret_only"
   overall='1'
 fi
-if [ "$var_maths" -eq $var_ans ]; then
+if [[ "$var_maths" -eq $var_ans ]]; then
   echo "var_maths ..... $pass"
 else
   echo "var_maths ..... $fail"
   echo " expected $var_ans but got $var_maths"
   overall='1'
 fi
-if [ "$func_call" -eq $func_ans ]; then
+if [[ "$func_call" -eq $func_ans ]]; then
   echo "func_call ..... $pass"
 else
   echo -n "func_call ..... $fail"
   echo " expected $func_ans but got $func_call"
   overall='1'
 fi
-if [ "$cond_loop" -eq $cond_ans ]; then
+if [[ "$cond_loop" -eq $cond_ans ]]; then
   echo "cond_loop ..... $pass"
 else
   echo -n "cond_loop ..... $fail"
   echo " expected $cond_ans but got $cond_loop"
   overall='1'
 fi
-if [ "$func_args" -eq $args_ans ]; then
+if [[ "$func_args" -eq $args_ans ]]; then
   echo "func_args ..... $pass"
 else
   echo -n "func_args ..... $fail"
@@ -54,7 +62,7 @@ else
   overall='1'
 fi
 
-end=$(date +%s.%N)    
+end=$($date +%s.%N)    
 runtime=$(python -c "print(${end} - ${start})")
 
 echo "\nCompleted 5 tests in $runtime""s"