add fizzbuff

Author: begoon

nodes.py

@@ -715,8 +715,8 @@ def type_mismatch(v: BinaryOperation) -> str:
             self.operation = operations.get(self.operation, self.operation)
             assert left_type in ("INTEGER", "REAL"), type_mismatch(self)
 
-        elif self.operation in ("<", "<=", ">", ">=", "=", "<>", "|", "XOR"):
-            operations = {"=": "==", "<>": "!=", "|": "||", "XOR": "^"}
+        elif self.operation in ("<", "<=", ">", ">=", "=", "<>", "&", "|", "XOR"):
+            operations = {"=": "==", "<>": "!=", "&": "&&", "|": "||", "XOR": "^"}
             self.operation = operations.get(self.operation, self.operation)
             assert left_type in ("BOOLEAN", "INTEGER", "REAL"), type_mismatch(self)
 
@@ -729,7 +729,7 @@ def type_mismatch(v: BinaryOperation) -> str:
         return f"({self.left.c()} {self.operation} {self.right.c()})"
 
     def py(self) -> str:
-        operations = {"AND": "and", "OR": "or", "=": "==", "<>": "!=", "||": "or", "XOR": "^"}
+        operations = {"AND": "and", "OR": "or", "=": "==", "<>": "!=", "&&": "and", "||": "or", "XOR": "^"}
         operation = operations.get(self.operation, self.operation)
         rhs = self.right.py()
         if operation == "==" and rhs == "True":

runtime.c

@@ -91,7 +91,7 @@ void output(const char *fmt, ...)
     }
     va_end(args);
 
-    if (n > 1)
+    if (n > 1 || fmt[-1] == 'i')
         putchar('\n');
 }
 void pause(double seconds)

runtime.py

@@ -1,6 +1,9 @@
 def runtime_print(*args, **kwargs) -> None:
+    if not args:
+        return
     print(*args, end="", sep="")
-    if args and len(str(args[-1])) > 1:
+    last = args[-1]
+    if len(str(last)) > 1 or isinstance(last, int):
         print()
 
 

tests/fizzbuzz/test.easy

@@ -0,0 +1,17 @@
+PROGRAM FizzBuzz:
+  DECLARE n INTEGER;
+
+  PROCEDURE FizzBuzz(n INTEGER):
+    DECLARE i INTEGER;
+    FOR i := 1 TO n DO
+      SELECT TRUE OF
+        CASE (i MOD 3 = 0 & i MOD 5 = 0): OUTPUT "FizzBuzz";
+        CASE (i MOD 3 = 0): OUTPUT "Fizz";
+        CASE (i MOD 5 = 0): OUTPUT "Buzz";
+        OTHERWISE: OUTPUT i;
+      END SELECT;
+    END FOR;
+  END PROCEDURE FizzBuzz;
+
+  CALL FizzBuzz(20);
+END PROGRAM FizzBuzz;

tests/fizzbuzz/x/test.c

@@ -0,0 +1,29 @@
+#include "runtime.c"
+int n = {0};
+void FizzBuzz(int n)
+{
+    int i = {0};
+    for (i = 1; i <= n; i += 1)
+    {
+        if (((i % 3) == 0) && ((i % 5) == 0))
+        {
+            output("A", from_cstring("FizzBuzz"));
+        }
+        else if ((i % 3) == 0)
+        {
+            output("A", from_cstring("Fizz"));
+        }
+        else if ((i % 5) == 0)
+        {
+            output("A", from_cstring("Buzz"));
+        }
+        else
+        {
+            output("i", i);
+        }
+    }
+}
+int main()
+{
+    FizzBuzz(20);
+}

tests/fizzbuzz/x/test.output

@@ -0,0 +1,20 @@
+1
+2
+Fizz
+4
+Buzz
+Fizz
+7
+8
+Fizz
+Buzz
+11
+Fizz
+13
+14
+FizzBuzz
+16
+17
+Fizz
+19
+Buzz

tests/fizzbuzz/x/test.py

@@ -0,0 +1,23 @@
+from runtime import runtime_print
+
+n = 0
+
+
+def FizzBuzz(n):
+    i = 0
+    i = 1
+    while True:
+        if i > n:
+            break
+        if (((i % 3) == 0) and ((i % 5) == 0)):
+            runtime_print('FizzBuzz')
+        elif ((i % 3) == 0):
+            runtime_print('Fizz')
+        elif ((i % 5) == 0):
+            runtime_print('Buzz')
+        else:
+            runtime_print(i)
+        i += 1
+
+
+FizzBuzz(20)

tests/hw/x/test.output

@@ -1,2 +1,12 @@
 abc 100
-012345678910
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10