[lab3] fix bugs and release test

src/ir/values.rs

@@ -36,8 +36,8 @@ impl fmt::Display for BinaryOp {
             BinaryOp::Mul => write!(f, "mul"),
             BinaryOp::Div => write!(f, "div"),
             BinaryOp::Rem => write!(f, "rem"),
-            BinaryOp::And => write!(f, "or"),
-            BinaryOp::Or => write!(f, "and"),
+            BinaryOp::And => write!(f, "and"),
+            BinaryOp::Or => write!(f, "or"),
             BinaryOp::Xor => write!(f, "xor"),
             BinaryOp::Lt => write!(f, "lt"),
             BinaryOp::Gt => write!(f, "gt"),

tests/lab3/array_parameter.sy

@@ -5,6 +5,7 @@ void print_array(int a[], int len) {
   int i = 0;
   while (i < len) {
     putint(a[i]);
+    putch(32);
     i = i + 1;
   }
   return;

tests/lab3/combinator.sy

@@ -22,6 +22,7 @@ int main() {
   int n = getint();
   int k = getint();
   putint(cal_combiniation(n, k));
+  putch(32);
   putint(cal_permutation(n, k));  
   return 0;
 }

tests/lab3/global_test1.sy

@@ -7,8 +7,6 @@ int c[4][3];
 int i = 2024;
 
 int main() {
-    a = 0;
-
     while (a < 2) {
         b[a] = a * 2;
         a = a + 1;

tests/lab3/merge_sort.sy

@@ -89,6 +89,7 @@ int main() {
   i = 0;
   while (i < n) {
     putint(arr[i]);
+    putch(32);
     i = i + 1;
   }
   return 0;

tests/lab3/quick_sort.sy

@@ -45,6 +45,7 @@ int main() {
   i = 0;
   while (i < n) {
     putint(arr[i]);
+    putch(32);
     i = i + 1;
   }
   return 0;

tests/lab3/sort_array.sy

@@ -24,6 +24,7 @@ int main() {
   i = 0;
   while (i < 5) {
     putint(a[i]);
+    putch(32);
     i = i + 1;
   }
   return 0;

tests/lab3/sudoku.sy

@@ -129,6 +129,7 @@ int main() {
             a[i][j] = getint();
             if (a[i][j] < 0 || a[i][j] > 9) {
                 putint(0);
+                putch(32);
                 return 0;
             } else if (a[i][j] == 0) {
                 solve = 1;
@@ -145,17 +146,21 @@ int main() {
                 j = 0;
                 while (j < 9) {
                     putint(a[i][j]);
+                    putch(32);
                     j = j + 1;
                 }
                 i = i + 1;
             }
         } else {
             putint(0);
+            putch(32);
         }
     } else if (check_sudoku(a)) {
         putint(1);
+        putch(32);
     } else {
         putint(0);
+        putch(32);
     }
 
     return 0;

tests/lab3/two_dimension_array.sy

@@ -43,8 +43,11 @@ int main() {
   }
 
   putint(mat[0][3]);
+  putch(32);
   putint(mat[1][2]);
+  putch(32);
   putint(mat[2][1]);
+  putch(32);
   putint(mat[3][0]);
 
   return 0;

tests/test.py

@@ -79,7 +79,6 @@ def __init__(self, test: Test, output: str | None | list[str], exit_code: int, c
                 self.passed = exit_code == 0
             else:
                 if not concat_output:  # lab3
-                    print(output, test.expected)
                     self.passed = exit_code == 0 and output == test.expected
                 else:  # lab4
                     expected = "".join(test.expected)