.gitignore

@@ -3,4 +3,5 @@
 *.log
 tmp/
 
-tests/.lit-test-times.txt
+tests/.lit_test_times.txt
+**/Output/

README.md

+# Compiling Techniques - More Tests
+
+This project adds additional `.choc` tests that are not covered by the provided tests.
+
+[- Disclaimer: There is no guarantee that the tests provided here are correct. This is a collaborative student effort. -]
+
+## Running tests
+
+Just point `lit` at the tests directory, e.g.:
+
+```sh
+lit ../comptech-more-tests/tests/parser
+```
+
+(Your virtual environment which has `lit` and `choco-opt` in `PATH` needs to be activated.)
+
+## Generating new tests
+
+If you want to add a new test, the easiest way is to add a new `.choc` file in `gen-input/**/*.choc`. This is only a regular `.choc` file, demonstrating the syntax that should be tested. For example a file containing `i: [[int]] = 0` to test nested list types.
+
+(Note: This workflow will probably need to be adapted for further assignments, but for the first one - Parser - it should be fine.)
+
+Then run the `gen.py` script. This will write a test case that `lit` understands into `tests/**/*.choc`. It uses _your_ `choco-opt` implementation to generate the expected output. Tests that already exist will not be overwritten.
+(Your virtual environment which has `choco-opt` in `PATH` needs to be activated.)
+
+```sh
+./gen.py
+```
+
+If the existing tests really need to be overwritten for some reason, pass the `--force`/`-f` flag. This is usually not necessary.
+
+```sh
+./gen.py -f
+```

gen.py

 #!/usr/bin/env python3
 import subprocess
+import sys
+import os
 from pathlib import Path
 
 
-def gen_test(input_file, output_file):
-    command = ["choco-opt", input_file]
+def gen_test(input_file: Path, output_file: Path):
+    output_file_existed_before = output_file.exists()
+
     try:
+        with open(output_file, "w") as f:
+            f.write("# RUN: choco-opt %s | filecheck %s\n\n")
+            for line in input_file.open("r"):
+                f.write(line)
+
         result = subprocess.run(
-            command,
+            ["choco-opt", output_file],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
             check=True,
         )
-        with open(output_file, "w") as f:
-            f.write("# RUN: choco-opt %s | filecheck %s\n\n")
-            for line in input_file.open("r"):
-                f.write(line)
+        output_lines = result.stdout.split("\n")
 
-            output_lines = result.stdout.split("\n")
+        with open(output_file, "a") as f:
             f.write(f"\n# CHECK:      {output_lines[0]}\n")
             for line in output_lines[1:]:
                 if line.strip():
                     f.write(f"# CHECK-NEXT: {line}\n")
+                else: 
+                    break
 
-    except subprocess.CalledProcessError as e:
-        print(f"Error running choco-opt on {input_file}: {e.stderr}")
+    except Exception as e:
+        if not output_file_existed_before:
+            os.remove(output_file)
+        raise e
 
 
 def main():
@@ -34,11 +43,19 @@ def main():
 
     output_dir.mkdir(exist_ok=True)
 
+    force_regenerate = len(sys.argv) > 1 and sys.argv[1] in ["--force", "-f"]
+
     for input_file in input_dir.rglob("*.choc"):
         relative_path = input_file.relative_to(input_dir)
         output_file = output_dir / relative_path
         output_file.parent.mkdir(parents=True, exist_ok=True)
-        gen_test(input_file, output_file)
+        if force_regenerate or not output_file.exists():
+            print(f"Generating {output_file}...")
+            gen_test(input_file, output_file)
+        else:
+            print(f"Skipping re-generation of {output_file}...")
+
+    print("All done!")
 
 
 if __name__ == "__main__":

gen_input/parser/associativity/and.choc

+a and b and c

gen_input/parser/associativity/division.choc

+0 // 1 // 2

gen_input/parser/associativity/if.choc

+1 if 2 else 3 if 4 else 5

gen_input/parser/associativity/index.choc

+[[a,b],[c,d]][e][f]

gen_input/parser/associativity/minus.choc

+0 - 1 - 2

gen_input/parser/associativity/modulo.choc

+0 % 1 % 2

gen_input/parser/associativity/multiplication.choc

+0 * 1 * 2

gen_input/parser/associativity/or.choc

+a or b or c

gen_input/parser/associativity/plus.choc

+a + b + c

gen_input/parser/defun_if_elif_else.choc

+def foo():
+    if True:
+        "then"
+    elif 1:
+        "than"
+    else:
+        "thon"

gen_input/parser/minus_one_assign_two_valid.choc

+-1 = 2

gen_input/parser/multiple_unary_minus.choc

-----1

gen_input/parser/nest_list_and_indices.choc

+[ a[3][4][ [5, 6] ], b[ [1] ] ]

gen_input/parser/nested_list_types.choc

+i: [[str]] = 0

gen_input/parser/precedence/4_negate.choc

+a ----- b

gen_input/parser/precedence/add_and_not_not.choc

+a + b and not not c

gen_input/parser/precedence/add_mul_sub.choc

+3 + 4 * 5 - 6