minecraft-datapack-language 15.4.35__tar.gz → 15.4.36__tar.gz

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/minecraft/tags/function/load.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "test1:load"
+  ]
+}

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/test1/function/load.mcfunction

@@ -0,0 +1,7 @@
+# Load function - runs when datapack loads
+# Generated by MDL Compiler
+
+scoreboard objectives add counter dummy "counter"
+scoreboard objectives add global_timer dummy "global_timer"
+
+function test1:load1

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/test1/function/load1.mcfunction

@@ -0,0 +1,3 @@
+# Function: test1:load1
+
+tellraw @a {"text":"Datapack loaded successfully!"}

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/test1/function/main.mcfunction

@@ -0,0 +1,8 @@
+# Function: test1:main
+
+tellraw @a {"text":"Hello from test1!"}
+scoreboard players set @s counter 10
+tellraw @a {"text":"Counter: ","extra":[{"score":{"name":"@s","objective":"counter"}}]}
+execute if score @s counter matches 6.. run function test1:main__if_1
+execute unless score @s counter matches 6.. run function test1:main__else_1
+execute as @a run function test1:testfunc

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/test1/function/main__else_1.mcfunction

@@ -0,0 +1,2 @@
+# Function: test1:main__else_1
+tellraw @a {"text":"Try again!"}

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/test1/function/main__if_1.mcfunction

@@ -0,0 +1,2 @@
+# Function: test1:main__if_1
+tellraw @a {"text":"High counter!"}

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/test1/function/testfunc.mcfunction

@@ -0,0 +1,4 @@
+# Function: test1:testfunc
+
+scoreboard players set @s testfunccount1 10
+function test1:testfunc__while_1

minecraft_datapack_language-15.4.36/.mdl-out-test1/data/test1/function/testfunc__while_1.mcfunction

@@ -0,0 +1,6 @@
+# Function: test1:testfunc__while_1
+tellraw @a {"text":"Hello from testfunc!"}
+scoreboard players operation @s temp_1 = @s testfunccount1
+scoreboard players remove @s temp_1 1
+scoreboard players operation @s testfunccount1 = @s temp_1
+execute if score @s testfunccount1 matches 1.. run function test1:testfunc__while_1

minecraft_datapack_language-15.4.36/.mdl-out-test1/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Generated by MDL CLI"
+  }
+}

{minecraft_datapack_language-15.4.35/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.4.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.35
+Version: 15.4.36
 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-15.4.36/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.4.35"
+tag: "v15.4.35"
+updated_at: "2025-09-05T06:19:22Z"

{minecraft_datapack_language-15.4.35 → minecraft_datapack_language-15.4.36}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.4.35'
-__version_tuple__ = version_tuple = (15, 4, 35)
+__version__ = version = '15.4.36'
+__version_tuple__ = version_tuple = (15, 4, 36)
 
-__commit_id__ = commit_id = 'gc1645a725'
+__commit_id__ = commit_id = 'g68a65e479'

{minecraft_datapack_language-15.4.35 → minecraft_datapack_language-15.4.36}/minecraft_datapack_language/mdl_compiler.py

@@ -148,9 +148,9 @@ class MDLCompiler:
             lines.append(f"# Scope: {func.scope}")
         lines.append("")
         
-        # Reset temporary commands for this function
-        if hasattr(self, 'temp_commands'):
-            self.temp_commands = []
+        # Ensure a temp-command sink stack exists
+        if not hasattr(self, '_temp_sink_stack'):
+            self._temp_sink_stack = []
         
         # Set current function context and reset per-function counters
         self._current_function_name = func.name
@@ -158,18 +158,15 @@ class MDLCompiler:
         self.else_counter = 0
         self.while_counter = 0
         
+        # Route temp commands into this function's body by default
+        self._temp_sink_stack.append(lines)
         # Generate commands from function body
         for statement in func.body:
             cmd = self._statement_to_command(statement)
             if cmd:
                 lines.append(cmd)
-        
-        # Add any temporary commands that were generated during compilation
-        if hasattr(self, 'temp_commands') and self.temp_commands:
-            lines.append("")
-            lines.append("# Temporary variable operations:")
-            for temp_cmd in self.temp_commands:
-                lines.append(temp_cmd)
+        # Done routing temp commands for this function body
+        self._temp_sink_stack.pop()
         
         return "\n".join(lines)
     
@@ -401,6 +398,10 @@ class MDLCompiler:
         
         # Generate the if body function content
         if_body_lines = [f"# Function: {self.current_namespace}:{if_function_name}"]
+        # Route temp commands to the if-body function content
+        if not hasattr(self, '_temp_sink_stack'):
+            self._temp_sink_stack = []
+        self._temp_sink_stack.append(if_body_lines)
         for stmt in if_stmt.then_body:
             if isinstance(stmt, VariableAssignment):
                 cmd = self._variable_assignment_to_command(stmt)
@@ -419,6 +420,8 @@ class MDLCompiler:
             elif isinstance(stmt, FunctionCall):
                 cmd = self._function_call_to_command(stmt)
                 if_body_lines.append(cmd)
+        # Stop routing temp commands for if-body
+        self._temp_sink_stack.pop()
         
         # Handle else body if it exists
         if if_stmt.else_body:
@@ -443,6 +446,10 @@ class MDLCompiler:
                 else:
                     lines.append(f"execute unless {condition} run function {self.current_namespace}:{else_function_name}")
                 else_body_lines = [f"# Function: {self.current_namespace}:{else_function_name}"]
+                # Route temp commands into the else-body
+                if not hasattr(self, '_temp_sink_stack'):
+                    self._temp_sink_stack = []
+                self._temp_sink_stack.append(else_body_lines)
                 for stmt in if_stmt.else_body:
                     if isinstance(stmt, VariableAssignment):
                         cmd = self._variable_assignment_to_command(stmt)
@@ -461,6 +468,8 @@ class MDLCompiler:
                     elif isinstance(stmt, FunctionCall):
                         cmd = self._function_call_to_command(stmt)
                         else_body_lines.append(cmd)
+                # Stop routing temp commands for else-body
+                self._temp_sink_stack.pop()
                 self._store_generated_function(else_function_name, else_body_lines)
         
         # Store the if function as its own file
@@ -483,6 +492,9 @@ class MDLCompiler:
         loop_body_lines = [f"# Function: {self.current_namespace}:{loop_function_name}"]
         
         # Add the loop body statements
+        if not hasattr(self, '_temp_sink_stack'):
+            self._temp_sink_stack = []
+        self._temp_sink_stack.append(loop_body_lines)
         for stmt in while_loop.body:
             if isinstance(stmt, VariableAssignment):
                 cmd = self._variable_assignment_to_command(stmt)
@@ -505,6 +517,8 @@ class MDLCompiler:
         # Add the recursive call at the end to continue the loop
         cond_str, _inv = self._build_condition(while_loop.condition)
         loop_body_lines.append(f"execute if {cond_str} run function {self.current_namespace}:{loop_function_name}")
+        # Stop routing temp commands for while-body
+        self._temp_sink_stack.pop()
         
         # Store the loop function as its own file
         self._store_generated_function(loop_function_name, loop_body_lines)
@@ -680,10 +694,20 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
-            
-            if isinstance(expression.right, BinaryExpression):
-                self._store_temp_command(f"scoreboard players add @s {temp_var} {right_value}")
+                # Assign from left value (score or literal)
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+            # Add right value
+            if isinstance(expression.right, VariableSubstitution) or (isinstance(expression.right, str) and str(right_value).startswith("score ")):
+                parts = str(right_value).split()
+                scope = parts[1]
+                obj = parts[2]
+                self._store_temp_command(f"scoreboard players operation @s {temp_var} += {scope} {obj}")
             else:
                 self._store_temp_command(f"scoreboard players add @s {temp_var} {right_value}")
                 
@@ -691,10 +715,19 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
-            
-            if isinstance(expression.right, BinaryExpression):
-                self._store_temp_command(f"scoreboard players remove @s {temp_var} {right_value}")
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+            # Subtract right value
+            if isinstance(expression.right, VariableSubstitution) or (isinstance(expression.right, str) and str(right_value).startswith("score ")):
+                parts = str(right_value).split()
+                scope = parts[1]
+                obj = parts[2]
+                self._store_temp_command(f"scoreboard players operation @s {temp_var} -= {scope} {obj}")
             else:
                 self._store_temp_command(f"scoreboard players remove @s {temp_var} {right_value}")
                 
@@ -702,12 +735,18 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
             
             if isinstance(expression.right, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} *= @s {right_temp}")
             else:
-                # For literal values, we need to use a different approach
+                # For literal values, keep explicit multiply command for compatibility
                 if isinstance(expression.right, LiteralExpression):
                     self._store_temp_command(f"scoreboard players multiply @s {temp_var} {expression.right.value}")
                 else:
@@ -717,12 +756,18 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
             
             if isinstance(expression.right, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} /= @s {right_temp}")
             else:
-                # For literal values, we need to use a different approach
+                # For literal values, keep explicit divide command for compatibility
                 if isinstance(expression.right, LiteralExpression):
                     self._store_temp_command(f"scoreboard players divide @s {temp_var} {expression.right.value}")
                 else:
@@ -732,10 +777,12 @@ class MDLCompiler:
             self._store_temp_command(f"scoreboard players set @s {temp_var} 0")
     
     def _store_temp_command(self, command: str):
-        """Store a temporary command for later execution."""
-        if not hasattr(self, 'temp_commands'):
-            self.temp_commands = []
-        self.temp_commands.append(command)
+        """Append a temporary command into the current output sink (function/if/while body)."""
+        if hasattr(self, '_temp_sink_stack') and self._temp_sink_stack:
+            self._temp_sink_stack[-1].append(command)
+        else:
+            # Fallback: do nothing, but keep behavior predictable
+            pass
     
     def _generate_temp_variable_name(self) -> str:
         """Generate a unique temporary variable name."""

{minecraft_datapack_language-15.4.35 → minecraft_datapack_language-15.4.36/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.35
+Version: 15.4.36
 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-15.4.35 → minecraft_datapack_language-15.4.36}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -18,6 +18,8 @@ test_complex_scenarios.mdl
 test_comprehensive_fixes.mdl
 test_if_else_while.mdl
 test_simple.mdl
+tmp_test1.mdl
+tmp_test1.mdl~
 ./minecraft_datapack_language/__init__.py
 ./minecraft_datapack_language/_version.py
 ./minecraft_datapack_language/ast_nodes.py
@@ -37,6 +39,15 @@ test_simple.mdl
 .github/workflows/pypi.yml
 .github/workflows/release.yml
 .github/workflows/update-website-version.yml
+.mdl-out-test1/pack.mcmeta
+.mdl-out-test1/data/minecraft/tags/function/load.json
+.mdl-out-test1/data/test1/function/load.mcfunction
+.mdl-out-test1/data/test1/function/load1.mcfunction
+.mdl-out-test1/data/test1/function/main.mcfunction
+.mdl-out-test1/data/test1/function/main__else_1.mcfunction
+.mdl-out-test1/data/test1/function/main__if_1.mcfunction
+.mdl-out-test1/data/test1/function/testfunc.mcfunction
+.mdl-out-test1/data/test1/function/testfunc__while_1.mcfunction
 advancements/diamond_sword.json
 advancements/first_spell.json
 advancements/other_advancement.json
@@ -355,6 +366,7 @@ tests/test_complex_scenarios.py
 tests/test_comprehensive_end_to_end.py
 tests/test_python_api.py
 tests/test_python_bindings.py
+tests/test_user_regression_test1.py
 vscode-extension/README.md
 vscode-extension/language-configuration.json
 vscode-extension/package-lock.json

{minecraft_datapack_language-15.4.35 → minecraft_datapack_language-15.4.36}/tests/test_codegen_naming_and_logic.py

@@ -68,12 +68,11 @@ def test_complex_expression_temp_operations_present():
     math = (func_dir / 'math.mcfunction').read_text()
     # Assigned from temp
     assert 'scoreboard players operation @s x = @s temp_' in math
-    # Temp ops section includes add/remove/multiply/divide
-    assert '# Temporary variable operations:' in math
-    assert 'scoreboard players add @s temp_' in math
-    assert 'scoreboard players remove @s temp_' in math
-    assert ('scoreboard players multiply @s temp_' in math) or ('*= score @s temp_' in math)
-    assert ('scoreboard players divide @s temp_' in math) or ('/= score @s temp_' in math)
+    # Temp ops are now inlined directly within function bodies
+    assert 'scoreboard players add @s temp_' in math or '+= ' in math
+    assert 'scoreboard players remove @s temp_' in math or '-= ' in math
+    assert ('scoreboard players multiply @s temp_' in math) or ('*= ' in math)
+    assert ('scoreboard players divide @s temp_' in math) or ('/= ' in math)
 
 
 def test_else_branch_written_separately():

{minecraft_datapack_language-15.4.35 → minecraft_datapack_language-15.4.36}/tests/test_comprehensive_end_to_end.py

@@ -215,7 +215,8 @@ class TestComprehensiveEndToEnd(TestCase):
             self.assertTrue((output_path_obj / "pack.mcmeta").exists())
             self.assertTrue((output_path_obj / "data").exists())
             self.assertTrue((output_path_obj / "data" / "epic").exists())
-            self.assertTrue((output_path_obj / "data" / "epic" / "functions").exists())
+            # Accept either 'function' or 'functions' dir depending on dir_map
+            self.assertTrue((output_path_obj / "data" / "epic" / "function").exists() or (output_path_obj / "data" / "epic" / "functions").exists())
             self.assertTrue((output_path_obj / "data" / "minecraft" / "tags" / "items").exists())
             
             # Verify pack.mcmeta content
@@ -225,7 +226,9 @@ class TestComprehensiveEndToEnd(TestCase):
                 self.assertEqual(pack_data["pack"]["description"], "An epic adventure datapack with magic and combat")
             
             # Verify function files
-            functions_dir = output_path_obj / "data" / "epic" / "functions"
+            functions_dir = output_path_obj / "data" / "epic" / "function"
+            if not functions_dir.exists():
+                functions_dir = output_path_obj / "data" / "epic" / "functions"
             expected_functions = [
                 "initialize_game.mcfunction",
                 "cast_spell.mcfunction", 

minecraft_datapack_language-15.4.36/tests/test_user_regression_test1.py

@@ -0,0 +1,43 @@
+from pathlib import Path
+import tempfile
+
+from minecraft_datapack_language.mdl_parser import MDLParser
+from minecraft_datapack_language.mdl_compiler import MDLCompiler
+
+
+def test_user_snippet_while_and_temp_vars_inline():
+    src = (
+        'pack "test1" "Generated by MDL CLI" 82;\n'
+        'namespace "test1";\n\n'
+        '// Variables\n'
+        'var num counter<@s> = 0;\n'
+        'var num global_timer<@a> = 0;\n\n'
+        'function test1:testfunc {\n'
+        '    var num testfunccount1<@s> = 10;\n'
+        '    while $testfunccount1<@s>$ > 0 {\n'
+        '        say "Hello from testfunc!";\n'
+        '        testfunccount1<@s> = $testfunccount1<@s>$ - 1;\n'
+        '    }\n'
+        '}\n'
+    )
+
+    parser = MDLParser()
+    ast = parser.parse(src)
+    with tempfile.TemporaryDirectory() as tmp:
+        out = Path(tmp)
+        MDLCompiler().compile(ast, str(out))
+        func_dir = out / 'data' / 'test1' / 'function'
+        # parent file exists and calls generated while function
+        parent = (func_dir / 'testfunc.mcfunction').read_text()
+        assert 'function test1:testfunc__while_' in parent
+        # loop body file contains inlined temp ops and recursion
+        while_files = sorted(func_dir.glob('testfunc__while_*.mcfunction'))
+        assert while_files, 'expected generated while function file'
+        body = while_files[0].read_text()
+        assert 'tellraw @a {"text":"Hello from testfunc!"}' in body
+        assert 'scoreboard players operation @s temp_' in body
+        assert 'scoreboard players remove @s temp_' in body
+        assert 'scoreboard players operation @s testfunccount1 = @s temp_' in body
+        assert 'execute if score @s testfunccount1 matches 1.. run function test1:testfunc__while_' in body
+
+

minecraft_datapack_language-15.4.36/tmp_test1.mdl

@@ -0,0 +1,40 @@
+pack "test1" "Generated by MDL CLI" 82;
+namespace "test1";
+
+// Variables
+var num counter<@s> = 0;
+var num global_timer<@a> = 0;
+
+// Main function
+function test1:main {
+    say "Hello from test1!";
+    
+    // Variable example
+    counter<@s> = 10;
+    say "Counter: $counter<@s>$";
+    
+    // Conditional example
+    if $counter<@s>$ > 5 {
+        say "High counter!";
+    } else {
+        say "Try again!";
+    }
+
+    exec test1:testfunc<@a>;
+}
+
+function test1:testfunc {
+    var num testfunccount1<@s> = 10;
+    while $testfunccount1<@s>$ > 0 {
+        say "Hello from testfunc!";
+        testfunccount1<@s> = $testfunccount1<@s>$ - 1;
+    }
+}
+
+// Load function
+function test1:load1 {
+    say "Datapack loaded successfully!";
+}
+
+// Hook to run on load
+on_load test1:load1;

minecraft_datapack_language-15.4.35/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.4.34"
-tag: "v15.4.34"
-updated_at: "2025-09-04T04:59:52Z"