Allow merging across tabs

tested/configs.py

@@ -125,7 +125,7 @@ def options(self) -> Options:
 class Bundle:
     """A bundle of arguments and configs for running everything."""
 
-    lang_config: "Language"
+    language: "Language"
     global_config: GlobalConfig
     out: IO
 
@@ -194,4 +194,4 @@ def create_bundle(
         suite=suite,
     )
     lang_config = langs.get_language(global_config, language)
-    return Bundle(lang_config=lang_config, global_config=global_config, out=output)
+    return Bundle(language=lang_config, global_config=global_config, out=output)

tested/descriptions/__init__.py

@@ -34,7 +34,7 @@ def process_problem_statement(
 
     bundle = Bundle(
         global_config=global_config,
-        lang_config=language,
+        language=language,
         out=open(os.devnull, "w"),
     )
 

tested/descriptions/converters.py

@@ -48,7 +48,7 @@ def convert_templated_problem(bundle: Bundle, raw_description: str) -> str:
     description_template = Template(
         source=raw_description, autoescape=False, keep_trailing_newline=True
     )
-    language = bundle.lang_config
+    language = bundle.language
     set_locale(bundle.config.natural_language)
     return description_template.render(
         # Conventionalize functions

tested/descriptions/renderer.py

@@ -20,7 +20,7 @@ def render_one_statement(bundle: Bundle, statement: str) -> str:
     parsed_string = parse_string(statement)
     generated_statement = generate_statement(bundle, parsed_string)
     # Allow the language to modify the template a bit.
-    return bundle.lang_config.cleanup_description(generated_statement)
+    return bundle.language.cleanup_description(generated_statement)
 
 
 class TestedRenderer(MarkdownRenderer):
@@ -40,7 +40,7 @@ def _render_doctest(self, element: block.FencedCode) -> str:
         doctests = self._doctest_parser.get_examples(raw_code)
 
         resulting_lines = []
-        prompt = self.bundle.lang_config.get_declaration_metadata().get("prompt", ">")
+        prompt = self.bundle.language.get_declaration_metadata().get("prompt", ">")
 
         # Both the doctests and the results are parsed as values in the DSL.
         for examples in doctests:

tested/judge/compilation.py

@@ -6,8 +6,9 @@
 from typing import List, Optional, Tuple, Union
 
 from tested.configs import Bundle
-from tested.dodona import AnnotateCode, Message, Status
+from tested.dodona import Status
 from tested.internationalization import get_i18n_string
+from tested.judge.planning import CompilationResult
 from tested.judge.utils import BaseExecutionResult, run_command
 from tested.languages.config import FileFilter, Language
 from tested.languages.utils import convert_stacktrace_to_clickable_feedback
@@ -53,7 +54,7 @@ def run_compilation(
              decide to fallback to individual mode if the compilation result is
              not positive.
     """
-    command, files = bundle.lang_config.compilation(dependencies)
+    command, files = bundle.language.compilation(dependencies)
     _logger.debug(
         "Generating files with command %s in directory %s", command, directory
     )
@@ -64,25 +65,24 @@ def run_compilation(
 
 def process_compile_results(
     language_config: Language, results: Optional[BaseExecutionResult]
-) -> Tuple[List[Message], Status, List[AnnotateCode]]:
+) -> CompilationResult:
     """
     Process the output of a compilation step. It will convert the result of the
     command into a list of messages and a status. If the status is not correct,
     the messages and status may be passed to Dodona unchanged. Alternatively, they
     can be kept to show them with the first context.
     """
-    messages = []
 
     # There was no compilation
     if results is None:
-        return messages, Status.CORRECT, []
+        return [], Status.CORRECT, []
 
     show_stdout = False
     _logger.debug("Received stderr from compiler: " + results.stderr)
     compiler_messages, annotations, stdout, stderr = language_config.compiler_output(
         results.stdout, results.stderr
     )
-    messages.extend(compiler_messages)
+    messages = compiler_messages
     shown_messages = annotations or compiler_messages
 
     # Report stderr.