Merge pull request #532 from dodona-edu/feat/add-cpp

Add C++

Author: jorg-vr

.gitignore

@@ -82,3 +82,9 @@ venv-*/
 .venv/
 node_modules/
 result/
+
+# Visual Studio Code
+universal-judge.sln
+.data/current/python
+.data/current/python-packages
+.vscode/

tested/dsl/schema-strict.json

@@ -778,7 +778,8 @@
         "kotlin",
         "python",
         "runhaskell",
-        "csharp"
+        "csharp",
+        "cpp"
       ]
     },
     "message" : {

tested/dsl/schema.json

@@ -778,7 +778,8 @@
         "kotlin",
         "python",
         "runhaskell",
-        "csharp"
+        "csharp",
+        "cpp"
       ]
     },
     "message" : {

tested/languages/__init__.py

@@ -11,6 +11,7 @@
 
 from tested.languages.bash.config import Bash
 from tested.languages.c.config import C
+from tested.languages.cpp.config import CPP
 from tested.languages.csharp.config import CSharp
 from tested.languages.haskell.config import Haskell
 from tested.languages.java.config import Java
@@ -36,6 +37,7 @@
     "python": Python,
     "runhaskell": RunHaskell,
     "csharp": CSharp,
+    "cpp": CPP,
 }
 
 

tested/languages/cpp/config.py

@@ -0,0 +1,215 @@
+import re
+from pathlib import Path
+
+from tested.datatypes import AllTypes
+from tested.dodona import AnnotateCode, Message
+from tested.features import Construct, TypeSupport
+from tested.languages.conventionalize import (
+    Conventionable,
+    NamingConventions,
+    submission_file,
+)
+from tested.languages.cpp.generators import CPPGenerator
+from tested.languages.language import (
+    CallbackResult,
+    Command,
+    Language,
+    TypeDeclarationMetadata,
+)
+from tested.languages.preparation import PreparedExecutionUnit
+from tested.languages.utils import executable_name
+from tested.serialisation import Statement, Value
+
+
+class CPP(Language):
+    def initial_dependencies(self) -> list[str]:
+        return [
+            "values.h",
+            "values.cpp",
+            "values.tpp",
+            "evaluation_result.h",
+            "evaluation_result.cpp",
+        ]
+
+    def needs_selector(self):
+        return True
+
+    def file_extension(self) -> str:
+        return "cpp"
+
+    def comment(self, text: str) -> str:
+        return f"// {text}"
+
+    def naming_conventions(self) -> dict[Conventionable, NamingConventions]:
+        return {
+            "identifier": "camel_case",
+            "property": "camel_case",
+            "class": "pascal_case",
+            "global_identifier": "macro_case",
+        }
+
+    def supported_constructs(self) -> set[Construct]:
+        return {
+            Construct.FUNCTION_CALLS,
+            Construct.ASSIGNMENTS,
+            Construct.GLOBAL_VARIABLES,
+            Construct.OBJECTS,
+            Construct.HETEROGENEOUS_COLLECTIONS,
+            Construct.DEFAULT_PARAMETERS,
+            Construct.HETEROGENEOUS_ARGUMENTS,
+            Construct.EXCEPTIONS,
+        }
+
+    def datatype_support(self) -> dict[AllTypes, TypeSupport]:
+        return {  # type: ignore
+            "integer": "supported",
+            "real": "supported",
+            "char": "supported",
+            "text": "supported",
+            "string": "supported",
+            "boolean": "supported",
+            "nothing": "supported",
+            "undefined": "reduced",
+            "null": "reduced",
+            "int8": "supported",
+            "uint8": "supported",
+            "int16": "supported",
+            "uint16": "supported",
+            "int32": "supported",
+            "uint32": "supported",
+            "int64": "supported",
+            "uint64": "supported",
+            "single_precision": "supported",
+            "double_precision": "supported",
+            "double_extended": "supported",
+            "sequence": "supported",
+            "set": "supported",
+            "map": "supported",
+            "dictionary": "supported",
+            "object": "reduced",
+            "array": "supported",
+            "list": "supported",
+            "tuple": "supported",
+        }
+
+    def compilation(self, files: list[str]) -> CallbackResult:
+        main_file = files[-1]
+        exec_file = Path(main_file).stem
+        result = executable_name(exec_file)
+        assert self.config
+        return (
+            [
+                "g++",
+                "-std=c++20",
+                "-Wall",
+                "-O3" if self.config.options.compiler_optimizations else "-O0",
+                "evaluation_result.cpp",
+                "values.cpp",
+                main_file,
+                "-o",
+                result,
+            ],
+            [result],
+        )
+
+    def execution(self, cwd: Path, file: str, arguments: list[str]) -> Command:
+        local_file = cwd / executable_name(Path(file).stem)
+        return [str(local_file.absolute()), *arguments]
+
+    def modify_solution(self, solution: Path):
+        with open(solution, "r") as file:
+            contents = file.read()
+        # We use regex to find the main function.
+        # First, check if we have a no-arg main function.
+        # If so, replace it with a renamed main function that does have args.
+        no_args = re.compile(r"(int|void)(\s+)main(\s*)\((\s*)\)(\s*{)")
+        replacement = r"int\2solution_main\3(\4int argc, char* argv[])\5"
+        contents, nr = re.subn(no_args, replacement, contents, count=1)
+        if nr == 0:
+            # There was no main function without arguments. Now we try a main
+            # function with arguments.
+            with_args = re.compile(r"(int|void)(\s+)main(\s*)\((\s*)int")
+            replacement = r"int\2solution_main\3(\4int"
+            contents = re.sub(with_args, replacement, contents, count=1)
+        with open(solution, "w") as file:
+            header = "#pragma once\n\n"
+            file.write(header + contents)
+
+    def linter(self, remaining: float) -> tuple[list[Message], list[AnnotateCode]]:
+        # Import locally to prevent errors.
+        from tested.languages.c import linter
+
+        assert self.config
+        return linter.run_cppcheck(self.config.dodona, remaining, "c++")
+
+    def cleanup_stacktrace(self, stacktrace: str) -> str:
+        result = ""
+        in_student_file = False
+        for line in stacktrace.splitlines(keepends=True):
+            if submission_file(self) in line:
+                in_student_file = True
+            elif "|" not in line:
+                in_student_file = False
+
+            if in_student_file:
+                line = line.replace(submission_file(self), "<code>")
+                result += line
+        return result
+
+    def is_source_file(self, file: Path) -> bool:
+        return file.suffix in (".cpp", ".h", ".tpp")
+
+    def generator(self) -> CPPGenerator:
+        return CPPGenerator(self.file_extension())
+
+    def generate_statement(self, statement: Statement) -> str:
+        return self.generator().convert_statement(statement)
+
+    def generate_execution_unit(self, execution_unit: "PreparedExecutionUnit") -> str:
+        return self.generator().convert_execution_unit(execution_unit)
+
+    def generate_selector(self, contexts: list[str]) -> str:
+        return self.generator().convert_selector(contexts)
+
+    def generate_encoder(self, values: list[Value]) -> str:
+        return self.generator().convert_encoder(values)
+
+    def get_declaration_metadata(self) -> TypeDeclarationMetadata:
+        return {
+            "names": {  # type: ignore
+                "integer": "int",
+                "real": "double",
+                "char": "char",
+                "text": "std::string",
+                "string": "std::string",
+                "boolean": "bool",
+                "nothing": "void",
+                "undefined": "void",
+                "int8": "std::int8_t",
+                "uint8": "std::uint8_t",
+                "int16": "std::int16_t",
+                "uint16": "std::uint16_t",
+                "int32": "std::int32_t",
+                "uint32": "std::uint32_t",
+                "int64": "std::int64_t",
+                "uint64": "std::uint64_t",
+                "bigint": "std::intmax_t",
+                "single_precision": "float",
+                "double_precision": "double",
+                "any": "std::any",
+                "sequence": "std::vector",
+                "array": "std::vector",
+                "list": "std::list",
+                "tuple": "std::tuple",
+                "set": "std::set",
+                "map": "std::map",
+            },
+            "nested": ("<", ">"),
+            "exception": "std::exception_ptr",
+        }
+
+    def is_void_method(self, name: str) -> bool:
+        assert self.config
+        regex = rf"void\s+{name}"
+        the_source = self.config.dodona.source.read_text()
+        return re.search(regex, the_source) is not None