minecraft-datapack-language 16.0.21__tar.gz → 16.0.23__tar.gz

{minecraft_datapack_language-16.0.21 → minecraft_datapack_language-16.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.21
+Version: 16.0.23
 Summary: Compile MDL language with explicit scoping into a Minecraft datapack (1.21+ ready). Features variables, control flow, error handling, and VS Code extension.
 Project-URL: Homepage, https://www.mcmdl.com
 Project-URL: Documentation, https://www.mcmdl.com/docs

minecraft_datapack_language-16.0.23/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "16.0.22"
+tag: "v16.0.22"
+updated_at: "2025-09-10T06:23:50Z"

{minecraft_datapack_language-16.0.21 → minecraft_datapack_language-16.0.23}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '16.0.21'
-__version_tuple__ = version_tuple = (16, 0, 21)
+__version__ = version = '16.0.23'
+__version_tuple__ = version_tuple = (16, 0, 23)
 
-__commit_id__ = commit_id = 'g8b5718e95'
+__commit_id__ = commit_id = 'g42a8773e7'

{minecraft_datapack_language-16.0.21 → minecraft_datapack_language-16.0.23}/minecraft_datapack_language/mdl_compiler.py

@@ -324,9 +324,8 @@ class MDLCompiler:
             if getattr(decl, 'initial_value', None) is None:
                 continue
             objective = self.variables.get(decl.name, decl.name)
-            scope = decl.scope.strip("<>") if decl.scope else "@a"
-            if scope == "@s":
-                scope = "@a"
+            resolved_scope = self._resolve_scope(decl.scope) if decl.scope else "@a"
+            scope = "@a" if resolved_scope == "@s" else resolved_scope
             init = decl.initial_value
             from .ast_nodes import LiteralExpression, VariableSubstitution
             if isinstance(init, LiteralExpression):
@@ -340,9 +339,8 @@ class MDLCompiler:
                 lines.append(f"scoreboard players set {scope} {objective} {val_str}")
             elif isinstance(init, VariableSubstitution):
                 src_obj = self.variables.get(init.name, init.name)
-                src_scope = init.scope.strip("<>") if init.scope else "@a"
-                if src_scope == "@s":
-                    src_scope = "@a"
+                src_resolved = self._resolve_scope(init.scope) if init.scope else "@a"
+                src_scope = "@a" if src_resolved == "@s" else src_resolved
                 lines.append(f"scoreboard players operation {scope} {objective} = {src_scope} {src_obj}")
 
         lines.append("")
@@ -404,7 +402,7 @@ class MDLCompiler:
         if assignment.name not in self.variables:
             self.variables[assignment.name] = assignment.name
         objective = self.variables.get(assignment.name, assignment.name)
-        scope = assignment.scope.strip("<>")
+        scope = self._resolve_scope(assignment.scope)
         
         # Check if the value is a complex expression
         if isinstance(assignment.value, BinaryExpression):
@@ -435,7 +433,7 @@ class MDLCompiler:
         # Register objective so load function adds it
         self.variables[decl.name] = objective
         # If there is an initial value, set it in current context
-        scope = decl.scope.strip("<>")
+        scope = self._resolve_scope(decl.scope)
         init = None
         try:
             init = self._expression_to_value(decl.initial_value)
@@ -474,7 +472,7 @@ class MDLCompiler:
                     parts.append(f'{{"text":"{text_before}"}}')
                 
                 objective = self.variables.get(var.name, var.name)
-                scope = var.scope.strip("<>")
+                scope = self._resolve_scope(var.scope)
                 parts.append(f'{{"score":{{"name":"{scope}","objective":"{objective}"}}}}')
                 
                 current_pos = var_pos + len(var_pattern)

{minecraft_datapack_language-16.0.21 → minecraft_datapack_language-16.0.23}/minecraft_datapack_language.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.21
+Version: 16.0.23
 Summary: Compile MDL language with explicit scoping into a Minecraft datapack (1.21+ ready). Features variables, control flow, error handling, and VS Code extension.
 Project-URL: Homepage, https://www.mcmdl.com
 Project-URL: Documentation, https://www.mcmdl.com/docs

{minecraft_datapack_language-16.0.21 → minecraft_datapack_language-16.0.23}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -378,6 +378,7 @@ tests/test_arithmetic_codegen.py
 tests/test_cli.py
 tests/test_codegen_naming_and_logic.py
 tests/test_compiler_fixes.py
+tests/test_complex_logic_and_arithmetic.py
 tests/test_complex_scenarios.py
 tests/test_comprehensive_end_to_end.py
 tests/test_examples.py

minecraft_datapack_language-16.0.23/tests/test_complex_logic_and_arithmetic.py

@@ -0,0 +1,91 @@
+import os
+import re
+
+from minecraft_datapack_language.mdl_parser import MDLParser
+from minecraft_datapack_language.mdl_compiler import MDLCompiler
+
+
+def compile_snippet(src: str, outdir: str):
+    parser = MDLParser("test.mdl")
+    program = parser.parse(src)
+    compiler = MDLCompiler(output_dir=outdir)
+    return compiler.compile(program, source_dir=outdir)
+
+
+def find_fn(out_dir: str, ns: str, name: str):
+    paths = [
+        os.path.join(out_dir, "data", ns, "functions", f"{name}.mcfunction"),
+        os.path.join(out_dir, "data", ns, "function", f"{name}.mcfunction"),
+    ]
+    for p in paths:
+        if os.path.exists(p):
+            return p
+    raise FileNotFoundError(paths)
+
+
+def test_complex_arithmetic_codegen(tmp_path):
+    src = '''
+pack "cx" "d" 82;
+namespace "cx";
+var num a<@s> = 1;
+var num b<@s> = 2;
+var num c<@s> = 3;
+var num d<@s> = 4;
+var num e<@s> = 5;
+var num f<@s> = 6;
+
+function cx:calc {
+    var x<@s> = -($a<@s>$ + $b<@s>$ * ($c<@s>$ - -$d<@s>$) / 2) + (-$e<@s>$) * 3 - $f<@s>$ * -1;
+}
+'''
+    out = compile_snippet(src, str(tmp_path))
+    fn = find_fn(out, "cx", "calc")
+    text = open(fn, "r", encoding="utf-8").read()
+    # No token names like GREATER etc
+    assert "GREATER" not in text and "LESS" not in text
+    # Must use multiply/divide/add/remove, never operation with numeric literal
+    assert " operation @s temp" not in text or " operation @s temp" in text  # allowed but not with numeric literal
+    assert re.search(r"players (multiply|divide) @s ", text)
+    # No 'operation *= 3' with numeric literal
+    assert re.search(r"operation @s .* \*= \d+", text) is None
+    assert re.search(r"operation @s .* /= \d+", text) is None
+
+
+def test_complex_logical_codegen(tmp_path):
+    src = '''
+pack "lx" "d" 82;
+namespace "lx";
+var num a<@s> = 0;
+var num b<@s> = 0;
+var num c<@s> = 0;
+var num d<@s> = 0;
+var num e<@s> = 0;
+var num f<@s> = 0;
+var num g<@s> = 0;
+var num h<@s> = 0;
+var num i<@s> = 0;
+var num j<@s> = 0;
+
+function lx:logic {
+    if ($a<@s>$ > 0 && ($b<@s>$ <= $c<@s>$ || !($d<@s>$ != $e<@s>$))) || (-$f<@s>$ < 0 && (($g<@s>$ >= $h<@s>$) && !($i<@s>$ < $j<@s>$))) {
+        say "pass";
+    } else {
+        say "fail";
+    }
+}
+'''
+    out = compile_snippet(src, str(tmp_path))
+    fn = find_fn(out, "lx", "logic")
+    text = open(fn, "r", encoding="utf-8").read()
+    # Ensure boolean temps are used (we expect at least one temp initialized to 0, then set to 1 conditionally)
+    assert re.search(r"players set @s temp_\d+ 0", text) is not None
+    assert re.search(r"execute (if|unless) .* run scoreboard players set @s temp_\d+ 1", text) is not None
+    # AND should appear as chained execute if's in one line
+    assert re.search(r"execute if .* if .* run ", text)
+    # OR should appear as two separate 'execute if ... set temp = 1' lines
+    assert len(re.findall(r"execute if .* run scoreboard players set @s temp_\d+ 1", text)) >= 2
+    # NOT_EQUAL is compiled via equals with inversion (unless)
+    assert re.search(r"execute unless score .* = .* run ", text) or re.search(r"= .*", text)
+    # No raw token names
+    assert "NOT_EQUAL" not in text and "EQUAL" not in text and "GREATER" not in text
+

{minecraft_datapack_language-16.0.21 → minecraft_datapack_language-16.0.23}/tests/test_global_scope.py

@@ -64,3 +64,28 @@ function p:caller {
     txt = open(caller_fn, "r", encoding="utf-8").read()
     assert "execute as @e[type=armor_stand,tag=mdl_global,limit=1] run function p:callee" in txt
 
+
+def test_global_scope_no_literal_leakage(tmp_path):
+    src = '''
+pack "helloworld" "Generated by MDL CLI" 82;
+namespace "helloworld";
+
+var num num1<global> = 5;
+
+function helloworld:somefunc {
+    num1<global> = $num1<global>$ + 1;
+
+    say "num1: $num1<global>$";
+}
+'''
+    out = compile_snippet(src, str(tmp_path))
+    fn = find_function_file(out, "helloworld", "somefunc")
+    text = open(fn, "r", encoding="utf-8").read()
+    # No literal 'global' should appear as a name in operation or tellraw
+    assert " operation global " not in text
+    assert '"name":"global"' not in text
+    # LHS assignment back to global must target the resolved selector
+    assert "scoreboard players operation @e[type=armor_stand,tag=mdl_global,limit=1] num1 =" in text
+    # tellraw JSON name field must use the resolved selector
+    assert '"name":"@e[type=armor_stand,tag=mdl_global,limit=1]"' in text
+

minecraft_datapack_language-16.0.21/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "16.0.20"
-tag: "v16.0.20"
-updated_at: "2025-09-10T06:19:23Z"