Updates constrain usage.

execute.py

@@ -4,6 +4,10 @@ import os
 import subprocess
 import tempfile
 
+HEADERS: str = """
+#include <bits/stdc++.h>
+"""
+
 
 def check_correctness(candidate, reference, cpp_type, task_id, completion_id):
     """
@@ -30,15 +34,18 @@ def check_correctness(candidate, reference, cpp_type, task_id, completion_id):
             base_run_result,
             "c++17",
         )
+        base_run_result = base_run_result[0]
+        base_run_passed = base_run_result == "passed"
+        base_run_compiled = (
+            base_run_result == "passed"
+            or base_run_result.startswith("failed: runtime error:")
+        )
         result = {
             **result,
             **dict(
-                base_run_passed=base_run_result[0] == "passed",
-                base_run_compiled=(
-                    base_run_result[0] == "passed"
-                    or base_run_result[0].startswith("failed: runtime error:")
-                ),
-                base_run_result=base_run_result[0],
+                base_run_passed=base_run_passed,
+                base_run_compiled=base_run_compiled,
+                base_run_result=base_run_result,
             ),
         }
     elif cpp_type == "sfinae":
@@ -58,17 +65,23 @@ def check_correctness(candidate, reference, cpp_type, task_id, completion_id):
             sfinae_constrain_result,
             "c++17",
         )
+        sfinae_run_result = sfinae_run_result[0]
+        sfinae_constrain_result = sfinae_constrain_result[0]
+        sfinae_run_passed = sfinae_run_result == "passed"
+        sfinae_run_compiled = sfinae_run_passed or sfinae_run_result.startswith(
+            "failed: runtime error:"
+        )
+        sfinae_constrain_passed = (
+            sfinae_constrain_result == "passed" and sfinae_run_compiled
+        )
         result = {
             **result,
             **dict(
-                sfinae_run_passed=sfinae_run_result[0] == "passed",
-                sfinae_run_compiled=(
-                    sfinae_run_result[0] == "passed"
-                    or sfinae_run_result[0].startswith("failed: runtime error:")
-                ),
-                sfinae_run_result=sfinae_run_result[0],
-                sfinae_constrain_passed=sfinae_constrain_result[0] == "passed",
-                sfinae_constrain_result=sfinae_constrain_result[0],
+                sfinae_run_passed=sfinae_run_passed,
+                sfinae_run_compiled=sfinae_run_compiled,
+                sfinae_run_result=sfinae_run_result,
+                sfinae_constrain_passed=sfinae_constrain_passed,
+                sfinae_constrain_result=sfinae_constrain_result,
             ),
         }
     elif cpp_type == "concepts":
@@ -88,20 +101,24 @@ def check_correctness(candidate, reference, cpp_type, task_id, completion_id):
             concepts_constrain_result,
             "c++20",
         )
+        concepts_run_result = concepts_run_result[0]
+        concepts_constrain_result = concepts_constrain_result[0]
+        concepts_run_passed = concepts_run_result == "passed"
+        concepts_run_compiled = (
+            concepts_run_passed
+            or concepts_run_result.startswith("failed: runtime error:")
+        )
+        concepts_constrain_passed = (
+            concepts_constrain_result == "passed" and concepts_run_compiled
+        )
         result = {
             **result,
             **dict(
-                concepts_run_passed=concepts_run_result[0] == "passed",
-                concepts_run_compiled=(
-                    concepts_run_result[0] == "passed"
-                    or concepts_run_result[0].startswith(
-                        "failed: runtime error:"
-                    )
-                ),
-                concepts_run_result=concepts_run_result[0],
-                concepts_constrain_passed=concepts_constrain_result[0]
-                == "passed",
-                concepts_constrain_result=concepts_constrain_result[0],
+                concepts_run_passed=concepts_run_passed,
+                concepts_run_compiled=concepts_run_compiled,
+                concepts_run_result=concepts_run_result,
+                concepts_constrain_passed=concepts_constrain_passed,
+                concepts_constrain_result=concepts_constrain_result,
             ),
         }
     else:
@@ -129,7 +146,7 @@ def process_case(target, candidate, reference, result, cppstd):
 
 def unsafe_execute_cpp(candidate, reference, result, timeout, cppstd):
     with create_tempdir():
-        code = "#include <bits/stdc++.h>\n" + candidate + "\n" + reference
+        code = "\n".join([HEADERS, candidate, reference])
         open(f"test.cpp", "w").write(code)
 
         cpp_compiler = os.getenv("GENERICIFY_CLANG")
@@ -171,7 +188,7 @@ def unsafe_execute_cpp(candidate, reference, result, timeout, cppstd):
 
 def invalid_compile_cpp(candidate, reference, result, timeout, cppstd):
     with create_tempdir():
-        code = "#include <bits/stdc++.h>\n" + candidate + reference
+        code = "\n".join([HEADERS, candidate, reference])
         open(f"invalid.cpp", "w").write(code)
 
         cpp_compiler = os.getenv("GENERICIFY_CLANG")