blah

cw/main.c

@@ -256,7 +256,6 @@ BIND* recursive_interpret(NODE *tree, ENV *env_ptr) {
       if(debug)printf("I got: ");
       if (var_bind->tree->type == CONSTANT) {
         if(debug){
-          printf("CONSTANT\n");
           print_leaf(var_bind->tree, 0);
         }
       } else {
@@ -315,6 +314,7 @@ BIND* recursive_interpret(NODE *tree, ENV *env_ptr) {
       return ret_val;
     } else {
       printf("HELP called a function with no return!!\n");
+      exit(1);
     }
   }
   if (tree->type == IF) {
@@ -376,7 +376,7 @@ BIND* recursive_interpret(NODE *tree, ENV *env_ptr) {
     if (debug) printf("Adding %d and %d\n", lhs->value, rhs->value);
     int result = lhs->value + rhs->value;
     return anon_binding((NODE*) get_int_token(result));
-  }
+ }
   if (tree->type == '-') {
     TOKEN* lhs = (TOKEN*) recursive_interpret(tree->left, env_ptr)->tree;
     TOKEN* rhs = (TOKEN*) recursive_interpret(tree->right, env_ptr)->tree;

cw/simple.c

@@ -1,5 +1,6 @@
 int whammy(int a) {
-  return a + 5;
+  int x = a;
+  return x + 5;
 }
 
 function twice(function f) {

cw/tests/twice.c

@@ -9,8 +9,8 @@ function twice(function f) {
 }
 
 int main() {
-  x = twice(whammy);
+  doublewhammy = twice(whammy);
 
-  return x(2);
+  return doublewhammy(2);
 }
 

cw/tests/var_maths.c

@@ -1,6 +1,9 @@
-/* ##answer: 11*/
+/* ##answer: 30*/
 int main() {
   int x = 5;
+  int y = x - 4;
+  int z = 10 - x;
+  int w = x % z;
 
-  return x + 3 * 2;
+  return x*x + z / (w + y);
 }