cw/tests/all_scopes.c

@@ -0,0 +1,13 @@
+/* ##answer: 220 */
+int y = 5;
+
+int fun1(){
+	int x = 11;
+	return x;
+}
+
+
+int main() { 
+	int x = 4;
+	return y * x * fun1();
+}

cw/tests/deep_closure.c

@@ -0,0 +1,14 @@
+/* ##answer: 18 */
+function cplus(int a) {
+  int cplusa(int b) {
+    int cplusab(int c) {
+      return a + b + c;
+    }
+    return cplusab;
+  }
+  return cplusa;
+}
+
+int main() {
+  return cplus(5)(6)(7);
+}

cw/tests/new_test.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-uname=`uname`
-if [ "$uname" = "Darwin" ]; then
-  date="gdate"
-  readlink="greadlink"
-else
-  date="date"
-  readlink="readlink"
-fi
-start=$($date +%s.%N)
-absdir=$($readlink -f $(dirname $0))
-
-pass="\033[32mPASSED\033[0m"
-fail="\033[31mFAILED\033[0m"
-
-tests=0
-passes=0
-
-for i in $(ls $absdir | grep .\*.c | sort); do
-  answer=`$absdir/../mycc < $absdir/$i | tail -n 1`
-  exp_ans=`grep --color=none "##answer" $absdir/$i | sed 's/[^0-9]\+\([0-9]\+\).\+/\1/g'`
-  echo -n "${i%.*} ... "
-  if [ "$answer" -eq "$exp_ans" ]; then
-    echo -e "$pass"
-    passes=$((passes+1))
-  else
-    echo -e "$fail expected $exp_ans got $answer"
-  fi
-  tests=$((tests+1))
-done
-
-end=$($date +%s.%N)    
-runtime=$(python -c "print(${end} - ${start})")
-
-echo -e "\n$passes/$tests passed in $runtime""s"
-
-exit $((tests-passes))

cw/tests/odd_recursion.c

@@ -0,0 +1,31 @@
+/* ##answer: 400 */
+int biggerIsOdd(int x, int y){
+  if(x>y){
+    return isOdd(x);
+  } else {
+    return isOdd(y);
+  }
+}
+
+int isOdd(int x){
+  if(x == 1){
+    return 1;
+  } else {
+    if(isOdd(x-1) == 1){
+      return 0;
+    } else {
+      return 1;
+    }
+  }
+}
+
+
+int main() { 
+  int x = 5;
+  int y = 7;
+
+  if(biggerIsOdd(x,y) == 1){
+    return 400;
+  }
+  return 66;
+}

cw/tests/really_deep_closure.c

@@ -0,0 +1,20 @@
+/* ##answer: 15 */
+function cplus(int a) {
+  int cplusa(int b) {
+    int cplusab(int c) {
+      int cplusabc(int d) {
+        int cplusabcd(int e) {
+          return a+b+c+d+e;
+        }
+        return cplusabcd;
+      }
+      return cplusabc;
+    }
+    return cplusab;
+  }
+  return cplusa;
+}
+
+int main() {
+  return cplus(1)(2)(3)(4)(5);
+}

cw/tests/test.sh

@@ -5,28 +5,26 @@ if [ "$uname" = "Darwin" ]; then
   readlink="greadlink"
   wc="gwc"
   sed="gsed"
+  awk="gawk"
 else
   date="date"
   readlink="readlink"
   wc="wc"
   sed="sed"
+  awk="awk"
 fi
 start=$($date +%s.%N)
 absdir=$($readlink -f $(dirname $0))
-
 pass="\033[32mPASSED\033[0m"
 fail="\033[31mFAILED\033[0m"
-
 tests=0
 passes=0
-
 num=`ls $absdir | grep .\*.c | $wc -L`
 num=$((num-2))
 fmt=`echo "%-$num""s"`
 for i in $(ls $absdir | grep .\*.c | sort); do
   answer=`$absdir/../mycc < $absdir/$i | tail -n 1`
-  # exp_ans=`grep --color=none "##answer" $absdir/$i | $sed 's/[^0-9]\+\([0-9]\+\).\+/\1/g'`
-  exp_ans=`grep --color=none "##answer" $absdir/$i | $sed 's/\/\* ##answer:\s\+\([^\*]\+\)\b\s*\*\//\1/g'`
+  exp_ans=`grep "##answer" $absdir/$i | $sed 's/\/\* ##answer:\s\+\([^\*]\+\)\b\s*\*\//\1/g'`
   printf $fmt "${i%.*}"
   echo -n " ... "
   if [ "$answer" == "$exp_ans" ]; then
@@ -37,10 +35,7 @@ for i in $(ls $absdir | grep .\*.c | sort); do
   fi
   tests=$((tests+1))
 done
-
 end=$($date +%s.%N)    
-runtime=$(python -c "print(${end} - ${start})")
-
+runtime=$(echo "$end $start" | $awk '{printf "%.2f", $1 - $2}')
 echo -e "\n$passes/$tests passed in $runtime""s"
-
 exit $((tests-passes))

tac/finaltest1.tac

@@ -0,0 +1,205 @@
+--C COMPILER
+int inner_fact(int n, int a) {
+  if (n==0) {
+    return a;
+  }
+  return inner_fact(n-1,a*n);
+}
+
+int fact(int n) {
+	return inner_fact(n,1);
+}
+
+int main(){
+	return fact(6);
+}
+parse finished
+~
+  ~
+    D
+      d
+        int
+        F
+          inner_fact
+          ,
+            ~
+              int
+              n
+            ~
+              int
+              a
+      ;
+        if
+          ==
+            n
+            0
+          return
+            a
+        return
+          apply
+            inner_fact
+            ,
+              -
+                n
+                1
+              *
+                a
+                n
+    D
+      d
+        int
+        F
+          fact
+          ~
+            int
+            n
+      return
+        apply
+          inner_fact
+          ,
+            n
+            1
+  D
+    d
+      int
+      F
+        main
+    return
+      apply
+        fact
+        6
+func inner_fact
+param n
+param a
+if n != 0 then L0
+ret a
+L0
+$t1 := n - 1
+$t2 := a * n
+arg $t1
+arg $t2
+call inner_fact, $t0
+ret $t0
+end inner_fact
+
+func fact
+param n
+arg n
+arg 1
+call inner_fact, $t3
+ret $t3
+end fact
+
+func main
+arg 6
+call fact, $t4
+ret $t4
+end main
+
+=====
+li $a0, 68
+li $v0, 9
+syscall
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $0, 4($fp)
+jal main
+j done
+#func inner_fact
+inner_fact:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+or $fp, $0, $v0
+la $t0, inner_fact
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#param n
+or $16, $0, $5
+#param a
+or $17, $0, $6
+#if n != 0 then L0
+bne $16, $0, L0
+#ret a
+or $v1, $0, $17
+jr $31
+#L0
+L0:
+#$t1 := n - 1
+li $9, 1
+sub $8, $16, $9
+#$t2 := a * n
+mult $17, $16
+mflo $10
+#arg $t1
+or $5, $0, $8
+#arg $t2
+or $6, $0, $10
+#call inner_fact, $t0
+jal inner_fact
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+lw $16, 8($fp)
+lw $17, 12($fp)
+or $11, $0, $v1
+#ret $t0
+or $v1, $0, $11
+jr $31
+#end inner_fact
+
+#func fact
+fact:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+or $fp, $0, $v0
+la $t0, fact
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#param n
+or $16, $0, $5
+#arg n
+or $5, $0, $16
+#arg 1
+li $12, 1
+or $6, $0, $12
+#call inner_fact, $t3
+jal inner_fact
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+lw $16, 8($fp)
+or $13, $0, $v1
+#ret $t3
+or $v1, $0, $13
+jr $31
+#end fact
+
+#func main
+main:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#arg 6
+li $14, 6
+or $5, $0, $14
+#call fact, $t4
+jal fact
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+or $15, $0, $v1
+#ret $t4
+or $v1, $0, $15
+jr $31
+#end main
+
+done:
+ori $v0, $0, 10
+syscall

tac/simple.c.orig

@@ -0,0 +1,14 @@
+int blah() {
+  int blah2() {
+    return 2;
+  }
+  return blah2();
+}
+
+int main() {
+<<<<<<< HEAD
+  return times(4+5);
+=======
+  return blah();
+>>>>>>> 87f65c41c69413a8cc3fe3da8b302ddb20630544
+}

tac/simple_BACKUP_41992.c

@@ -0,0 +1,14 @@
+int blah() {
+  int blah2() {
+    return 2;
+  }
+  return blah2();
+}
+
+int main() {
+<<<<<<< HEAD
+  return times(4+5);
+=======
+  return blah();
+>>>>>>> 87f65c41c69413a8cc3fe3da8b302ddb20630544
+}

tac/simple_BASE_41992.c

@@ -0,0 +1,6 @@
+int times(int x, int y) {
+  return x * y;
+}
+int main() {
+  return times(4+5, times(2, 4));
+}

tac/simple_LOCAL_41992.c

@@ -0,0 +1,6 @@
+int times(int x, int y) {
+  return x * y;
+}
+int main() {
+  return times(4+5);
+}

tac/simple_REMOTE_41992.c

@@ -0,0 +1,10 @@
+int blah() {
+  int blah2() {
+    return 2;
+  }
+  return blah2();
+}
+
+int main() {
+  return blah();
+}

tac/test10.tac

@@ -0,0 +1,156 @@
+--C COMPILER
+int main() { 
+int x = 4;
+int y = 5;
+int z = 6;
+int a = x + y;
+int b = y + z;
+int c = z * a;
+int d = b * c;
+int e = x;
+
+return e * d;
+}
+parse finished
+D
+  d
+    int
+    F
+      main
+  ;
+    ;
+      ;
+        ;
+          ;
+            ;
+              ;
+                ;
+                  ~
+                    int
+                    =
+                      x
+                      4
+                  ~
+                    int
+                    =
+                      y
+                      5
+                ~
+                  int
+                  =
+                    z
+                    6
+              ~
+                int
+                =
+                  a
+                  +
+                    x
+                    y
+            ~
+              int
+              =
+                b
+                +
+                  y
+                  z
+          ~
+            int
+            =
+              c
+              *
+                z
+                a
+        ~
+          int
+          =
+            d
+            *
+              b
+              c
+      ~
+        int
+        =
+          e
+          x
+    return
+      *
+        e
+        d
+func main
+x := 4
+y := 5
+z := 6
+$t0 := x + y
+a := $t0
+$t1 := y + z
+b := $t1
+$t2 := z * a
+c := $t2
+$t3 := b * c
+d := $t3
+e := x
+$t4 := e * d
+ret $t4
+end main
+
+=====
+li $a0, 68
+li $v0, 9
+syscall
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $0, 4($fp)
+jal main
+j done
+#func main
+main:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#x := 4
+li $8, 4
+or $16, $0, $8
+#y := 5
+li $9, 5
+or $17, $0, $9
+#z := 6
+li $10, 6
+or $18, $0, $10
+#$t0 := x + y
+add $11, $16, $17
+#a := $t0
+or $19, $0, $11
+#$t1 := y + z
+add $12, $17, $18
+#b := $t1
+or $20, $0, $12
+#$t2 := z * a
+mult $18, $19
+mflo $13
+#c := $t2
+or $21, $0, $13
+#$t3 := b * c
+mult $20, $21
+mflo $14
+#d := $t3
+or $22, $0, $14
+#e := x
+or $23, $0, $16
+#$t4 := e * d
+mult $23, $22
+mflo $15
+#ret $t4
+or $v1, $0, $15
+jr $31
+#end main
+
+done:
+ori $v0, $0, 10
+syscall

tac/test15.tac

@@ -0,0 +1,133 @@
+--C COMPILER
+int y = 5;
+
+int fun1(){
+	int x = 11;
+	return x;
+}
+
+
+int main() { 
+	int x = 4;
+	return y * x * fun1();
+}
+parse finished
+~
+  ~
+    ~
+      int
+      =
+        y
+        5
+    D
+      d
+        int
+        F
+          fun1
+      ;
+        ~
+          int
+          =
+            x
+            11
+        return
+          x
+  D
+    d
+      int
+      F
+        main
+    ;
+      ~
+        int
+        =
+          x
+          4
+      return
+        *
+          *
+            y
+            x
+          apply
+            fun1
+y := 5
+func fun1
+x := 11
+ret x
+end fun1
+
+func main
+x := 4
+$t1 := y * x
+call fun1, $t2
+$t0 := $t1 * $t2
+ret $t0
+end main
+
+=====
+li $a0, 68
+li $v0, 9
+syscall
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $0, 4($fp)
+jal main
+j done
+#y := 5
+li $8, 5
+or $16, $0, $8
+#func fun1
+fun1:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+sw $16, 8($fp)
+or $fp, $0, $v0
+la $t0, fun1
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#x := 11
+li $9, 11
+or $16, $0, $9
+#ret x
+or $v1, $0, $16
+jr $31
+#end fun1
+
+#func main
+main:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+sw $16, 8($fp)
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#x := 4
+li $10, 4
+or $16, $0, $10
+#$t1 := y * x
+mult $17, $16
+mflo $11
+#call fun1, $t2
+jal fun1
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+lw $16, 8($fp)
+lw $17, 12($fp)
+or $12, $0, $v1
+#$t0 := $t1 * $t2
+mult $11, $12
+mflo $13
+#ret $t0
+or $v1, $0, $13
+jr $31
+#end main
+
+done:
+ori $v0, $0, 10
+syscall

tac/test26.tac

@@ -0,0 +1,321 @@
+--C COMPILER
+int biggerIsOdd(int x, int y){
+	if(x>y){
+		return isOdd(x);
+	} else {
+		return isOdd(y);
+	}
+}
+
+int isOdd(int x){
+	if(x == 1){
+		return 1;
+	} else {
+		if(isOdd(x-1) == 1){
+			return 0;
+		} else {
+			return 1;
+		}
+	}
+}
+
+
+int main() { 
+	int x = 5;
+	int y = 7;
+
+	if(biggerIsOdd(x,y) == 1){
+		return 400;
+	}
+
+		return 66;
+	
+}
+parse finished
+~
+  ~
+    D
+      d
+        int
+        F
+          biggerIsOdd
+          ,
+            ~
+              int
+              x
+            ~
+              int
+              y
+      if
+        >
+          x
+          y
+        else
+          return
+            apply
+              isOdd
+              x
+          return
+            apply
+              isOdd
+              y
+    D
+      d
+        int
+        F
+          isOdd
+          ~
+            int
+            x
+      if
+        ==
+          x
+          1
+        else
+          return
+            1
+          if
+            ==
+              apply
+                isOdd
+                -
+                  x
+                  1
+              1
+            else
+              return
+                0
+              return
+                1
+  D
+    d
+      int
+      F
+        main
+    ;
+      ;
+        ~
+          int
+          =
+            x
+            5
+        ~
+          int
+          =
+            y
+            7
+      ;
+        if
+          ==
+            apply
+              biggerIsOdd
+              ,
+                x
+                y
+            1
+          return
+            400
+        return
+          66
+func biggerIsOdd
+param x
+param y
+if x <= y then L0
+arg x
+call isOdd, $t0
+ret $t0
+goto L1
+L0
+arg y
+call isOdd, $t1
+ret $t1
+L1
+end biggerIsOdd
+
+func isOdd
+param x
+if x != 1 then L2
+ret 1
+goto L3
+L2
+$t3 := x - 1
+arg $t3
+call isOdd, $t2
+if $t2 != 1 then L4
+ret 0
+goto L5
+L4
+ret 1
+L5
+L3
+end isOdd
+
+func main
+x := 5
+y := 7
+arg x
+arg y
+call biggerIsOdd, $t4
+if $t4 != 1 then L6
+ret 400
+L6
+ret 66
+end main
+
+=====
+li $a0, 68
+li $v0, 9
+syscall
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $0, 4($fp)
+jal main
+j done
+#func biggerIsOdd
+biggerIsOdd:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+or $fp, $0, $v0
+la $t0, biggerIsOdd
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#param x
+or $16, $0, $5
+#param y
+or $17, $0, $6
+#if x <= y then L0
+ble $16, $17, L0
+#arg x
+or $5, $0, $16
+#call isOdd, $t0
+jal isOdd
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+lw $16, 8($fp)
+lw $17, 12($fp)
+or $8, $0, $v1
+#ret $t0
+or $v1, $0, $8
+jr $31
+#goto L1
+j L1
+#L0
+L0:
+#arg y
+or $5, $0, $17
+#call isOdd, $t1
+jal isOdd
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+lw $16, 8($fp)
+lw $17, 12($fp)
+or $9, $0, $v1
+#ret $t1
+or $v1, $0, $9
+jr $31
+#L1
+L1:
+#end biggerIsOdd
+
+#func isOdd
+isOdd:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+or $fp, $0, $v0
+la $t0, isOdd
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#param x
+or $16, $0, $5
+#if x != 1 then L2
+li $10, 1
+bne $16, $10, L2
+#ret 1
+li $11, 1
+or $v1, $0, $11
+jr $31
+#goto L3
+j L3
+#L2
+L2:
+#$t3 := x - 1
+li $13, 1
+sub $12, $16, $13
+#arg $t3
+or $5, $0, $12
+#call isOdd, $t2
+jal isOdd
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+lw $16, 8($fp)
+or $14, $0, $v1
+#if $t2 != 1 then L4
+li $15, 1
+bne $14, $15, L4
+#ret 0
+or $v1, $0, $0
+jr $31
+#goto L5
+j L5
+#L4
+L4:
+#ret 1
+li $24, 1
+or $v1, $0, $24
+jr $31
+#L5
+L5:
+#L3
+L3:
+#end isOdd
+
+#func main
+main:
+li $a0, 68
+li $v0, 9
+syscall
+sw $fp, 4($v0)
+or $fp, $0, $v0
+la $t0, main
+sw $t0, 0($fp)
+sw $ra, 64($fp)
+#x := 5
+li $25, 5
+or $16, $0, $25
+#y := 7
+li $8, 7
+or $17, $0, $8
+#arg x
+or $5, $0, $16
+#arg y
+or $6, $0, $17
+#call biggerIsOdd, $t4
+jal biggerIsOdd
+lw $fp, 4($fp)
+lw $ra, 64($fp)
+lw $16, 8($fp)
+lw $17, 12($fp)
+or $9, $0, $v1
+#if $t4 != 1 then L6
+li $10, 1
+bne $9, $10, L6
+#ret 400
+li $11, 400
+or $v1, $0, $11
+jr $31
+#L6
+L6:
+#ret 66
+li $12, 66
+or $v1, $0, $12
+jr $31
+#end main
+
+done:
+ori $v0, $0, 10
+syscall