Updated statement/expression case and added programmingLanguageMap fo…

…r consistency

tested/dsl/translate_parser.py

@@ -91,6 +91,9 @@ class ReturnOracle(dict):
 class NaturalLanguageMap(dict):
     pass
 
+class ProgrammingLanguageMap(dict):
+    pass
+
 
 OptionDict = dict[str, int | bool]
 YamlObject = (
@@ -104,6 +107,7 @@ class NaturalLanguageMap(dict):
     | ExpressionString
     | ReturnOracle
     | NaturalLanguageMap
+    | ProgrammingLanguageMap
 )
 
 
@@ -158,6 +162,13 @@ def _natural_language_map(loader: yaml.Loader, node: yaml.Node) -> NaturalLangua
     ), f"A natural language map must be an object, got {result} which is a {type(result)}."
     return NaturalLanguageMap(result)
 
+def _programming_language_map(loader: yaml.Loader, node: yaml.Node) -> ProgrammingLanguageMap:
+    result = _parse_yaml_value(loader, node)
+    assert isinstance(
+        result, dict
+    ), f"A programming language map must be an object, got {result} which is a {type(result)}."
+    return ProgrammingLanguageMap(result)
+
 
 def _parse_yaml(yaml_stream: str) -> YamlObject:
     """
@@ -170,6 +181,7 @@ def _parse_yaml(yaml_stream: str) -> YamlObject:
     yaml.add_constructor("!expression", _expression_string, loader)
     yaml.add_constructor("!oracle", _return_oracle, loader)
     yaml.add_constructor("!natural_language", _natural_language_map, loader)
+    yaml.add_constructor("!programming_language", _programming_language_map, loader)
 
     try:
         return yaml.load(yaml_stream, loader)

tested/nat_translation.py

@@ -1,11 +1,11 @@
 import sys
-from typing import cast
 
 import yaml
 
 from tested.dsl.translate_parser import (
     ExpressionString,
     NaturalLanguageMap,
+    ProgrammingLanguageMap,
     ReturnOracle,
     YamlDict,
     YamlObject,
@@ -96,17 +96,16 @@ def translate_testcase(
 
     key_to_set = "statement" if "statement" in testcase else "expression"
     if (expr_stmt := testcase.get(key_to_set)) is not None:
-        # Translate NaturalLanguageMap
-        expr_stmt = natural_langauge_map_translation(expr_stmt, language)
-
-        # Perform translation based of translation stack.
-        if isinstance(expr_stmt, dict):
-            testcase[key_to_set] = {
-                k: format_string(cast(str, v), flat_stack) for k, v in expr_stmt.items()
+        # Program language translation found
+        if isinstance(expr_stmt, ProgrammingLanguageMap):
+            expr_stmt = {
+                k: natural_langauge_map_translation(v, language) for k, v in expr_stmt.items()
             }
-        elif isinstance(expr_stmt, str):
-            testcase[key_to_set] = format_string(expr_stmt, flat_stack)
+        elif isinstance(expr_stmt, NaturalLanguageMap): # Natural language translation found
+            assert language in expr_stmt
+            expr_stmt = expr_stmt[language]
 
+        testcase[key_to_set] = parse_value(expr_stmt, flat_stack)
     else:
         if (stdin_stmt := testcase.get("stdin")) is not None:
             # Translate NaturalLanguageMap