Merge remote-tracking branch 'origin/main' into self-hosted

compare_compilers.sh

@@ -29,7 +29,8 @@ done
 
 if [ ${#files[@]} = 0 ]; then
     # skip compiler_cli, because it has a race condition when two compilers simultaneously run it
-    files=( $(find stdlib examples tests -name '*.jou' | grep -v tests/should_succeed/compiler_cli | grep -v tests/crash | sort) )
+    # TODO: do not skip Advent Of Code files
+    files=( $(find stdlib examples tests -name '*.jou' | grep -v aoc2023 | grep -v tests/should_succeed/compiler_cli | grep -v tests/crash | sort) )
 fi
 if [ ${#actions[@]} = 0 ]; then
     actions=(tokenize parse run)

runtests.sh

@@ -101,9 +101,9 @@ function generate_expected_output()
         echo "A lot of output hidden..."
     else
         (
-            (grep -onH '# Warning: .*' $joufile || true) | sed -E s/'(.*):([0-9]*):# Warning: '/'compiler warning for file "\1", line \2: '/
-            (grep -onH '# Error: .*' $joufile || true) | sed -E s/'(.*):([0-9]*):# Error: '/'compiler error in file "\1", line \2: '/
-            (grep -oE '# Output:.*' $joufile || true) | sed -E s/'^# Output: ?'//
+            (grep --binary-files=text -onH '# Warning: .*' $joufile || true) | sed -E s/'(.*):([0-9]*):# Warning: '/'compiler warning for file "\1", line \2: '/
+            (grep --binary-files=text -onH '# Error: .*' $joufile || true) | sed -E s/'(.*):([0-9]*):# Error: '/'compiler error in file "\1", line \2: '/
+            (grep --binary-files=text -oE '# Output:.*' $joufile || true) | sed -E s/'^# Output: ?'//
         ) | sed "s,<joudir>,$joudir,g" | sed "s,<jouexe>,$jouexe,g"
     fi
     echo "Exit code: $correct_exit_code"

self_hosted/runs_wrong.txt

@@ -1,5 +1,4 @@
 # This is a list of files that don't behave correctly when ran with the self-hosted compiler.
-tests/crash/null_deref.jou
 tests/other_errors/missing_return.jou
 tests/other_errors/missing_value_in_return.jou
 tests/other_errors/noreturn_but_return_with_value.jou
@@ -10,3 +9,4 @@ tests/wrong_type/cannot_be_indexed.jou
 tests/wrong_type/index.jou
 tests/syntax_error/assign_to_None.jou
 tests/syntax_error/None_as_value.jou
+tests/should_succeed/union.jou