Adding the programming language tag to TESTed

tested/__main__.py

@@ -36,7 +36,6 @@
     "--translate",
     type=str,
     help="Specifies the language to translate translate the dsl to.",
-    default="-",
 )
 parser = parser.parse_args()
 

tested/configs.py

@@ -131,6 +131,7 @@ class Bundle:
     global_config: GlobalConfig
     out: IO
     preprocessor_messages: list[ExtendedMessage] = []
+    parser_messages: set[ExtendedMessage] = set()
 
     @property
     def config(self) -> DodonaConfig:
@@ -210,6 +211,7 @@ def create_bundle(
     suite: Suite,
     language: str | None = None,
     preprocessor_messages: list[ExtendedMessage] | None = None,
+    parser_messages: set[ExtendedMessage] | None = None,
 ) -> Bundle:
     """
     Create a configuration bundle.
@@ -219,8 +221,8 @@ def create_bundle(
     :param suite: The test suite.
     :param language: Optional programming language. If None, the one from the Dodona
                      configuration will be used.
-    :param preprocessor_messages: Indicator that the natural language translator
-    for the DSL key that was not defined in any translations map.
+    :param preprocessor_messages: Messages generated out of the preprocessor.
+    :param parser_messages: Messages generated out of the DSL-parser.
 
     :return: The configuration bundle.
     """
@@ -240,9 +242,13 @@ def create_bundle(
     if preprocessor_messages is None:
         preprocessor_messages = []
 
+    if parser_messages is None:
+        parser_messages = set()
+
     return Bundle(
         language=lang_config,
         global_config=global_config,
         out=output,
         preprocessor_messages=preprocessor_messages,
+        parser_messages=parser_messages,
     )

tested/descriptions/renderer.py

@@ -83,7 +83,7 @@ def _render_dsl_statements(self, element: block.FencedCode) -> str:
         rendered_dsl = self.render_children(element)
 
         # Parse the DSL
-        parsed_dsl = parse_dsl(rendered_dsl)
+        parsed_dsl, _ = parse_dsl(rendered_dsl)
 
         # Get all actual tests
         tests = []

tested/dodona.py

@@ -27,7 +27,7 @@ class Permission(StrEnum):
     ZEUS = auto()
 
 
-@define
+@define(frozen=True)
 class ExtendedMessage:
     description: str
     format: str = "text"

tested/dsl/dsl_errors.py

@@ -102,3 +102,14 @@ def build_preprocessor_messages(
         )
         for key in translations_missing_key
     ]
+
+
+def build_deprecated_language_message() -> ExtendedMessage:
+    """
+    Builds a message for not using the '!programming_language' tag in the DSL.
+    :return: The deprecation message.
+    """
+    return ExtendedMessage(
+        f"WARNING: You are using YAML syntax to specify statements or expressions in multiple programming languages without the `!programming_language` tag. This usage is deprecated!",
+        permission=Permission.STAFF,
+    )

tested/dsl/schema-strict-nat-translation.json

@@ -1266,6 +1266,32 @@
             "type" : "string",
             "description" : "A language-specific literal, which will be used verbatim."
           }
+        },
+        {
+          "type" : "object",
+          "required": [
+            "__tag__",
+            "value"
+          ],
+          "properties" : {
+            "__tag__": {
+              "type" : "string",
+              "description" : "The tag used in the yaml",
+              "const":  "!programming_language"
+            },
+            "value":{
+              "type": "object",
+              "description" : "Programming-language-specific statement or expression.",
+              "minProperties" : 1,
+              "propertyNames" : {
+                "$ref" : "#/definitions/programmingLanguage"
+              },
+              "items" : {
+                "type" : "string",
+                "description" : "A language-specific literal, which will be used verbatim."
+              }
+            }
+          }
         }
       ]
     },
@@ -1313,6 +1339,57 @@
             ]
           }
         },
+        {
+          "type" : "object",
+          "required": [
+            "__tag__",
+            "value"
+          ],
+          "properties" : {
+            "__tag__": {
+              "type" : "string",
+              "description" : "The tag used in the yaml",
+              "const":  "!programming_language"
+            },
+            "value":{
+              "type": "object",
+              "description" : "Programming-language-specific statement or expression.",
+              "minProperties" : 1,
+              "propertyNames" : {
+                "$ref" : "#/definitions/programmingLanguage"
+              },
+              "items" : {
+                "oneOf" : [
+                  {
+                    "type" : "string",
+                    "description" : "A language-specific literal, which will be used verbatim."
+                  },
+                  {
+                    "type" : "object",
+                    "required": [
+                      "__tag__",
+                      "value"
+                    ],
+                    "properties" : {
+                      "__tag__": {
+                        "type" : "string",
+                        "description" : "The tag used in the yaml",
+                        "const":  "!natural_language"
+                      },
+                      "value":{
+                        "type": "object",
+                        "additionalProperties": {
+                          "type" : "string",
+                          "description" : "A language-specific literal, which will be used verbatim."
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
         {
           "type" : "object",
           "required": [

tested/dsl/schema-strict.json

@@ -464,6 +464,14 @@
         },
         {
           "description" : "Programming-language-specific statement or expression.",
+          "anyOf": [
+            {
+              "type": "object"
+            },
+            {
+              "type": "programming_language"
+            }
+          ],
           "type" : "object",
           "minProperties" : 1,
           "propertyNames" : {
@@ -873,7 +881,8 @@
       "not" : {
         "type" : [
           "oracle",
-          "expression"
+          "expression",
+          "programming_language"
         ]
       }
     },