minecraft-datapack-language 15.4.34__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.34 → minecraft_datapack_language-15.4.36}/CONDITIONALS_IMPLEMENTATION.md

@@ -37,11 +37,11 @@ This document summarizes the implementation of if/else if/else functionality in
 - `README.md` - Added conditional blocks section
 - `docs/_docs/language-reference.md` - Added comprehensive conditional documentation
 - `docs/_docs/examples.md` - Added conditional examples
-- `docs/_docs/python-api.md` - Added conditional Python API examples
+- `docs/_docs/python-bindings.md` - Added conditional Python bindings examples
 
 ### Tests
 - `test_examples/conditionals.mdl` - Comprehensive MDL test file
-- `test_examples/conditionals.py` - Python API test file
+- `test_examples/conditionals.py` - Python bindings test file
 - `test_regression.py` - Regression test suite
 - `test_examples/run_all_tests.py` - Updated to include conditionals
 
@@ -55,12 +55,12 @@ This document summarizes the implementation of if/else if/else functionality in
 - ✅ Conditional function calls
 - ✅ Invalid syntax handling
 - ✅ Regression testing (existing functionality)
-- ✅ Python API compatibility
+- ✅ Python bindings compatibility
 
 ### Test Results
 - **Regression Tests**: 7/7 passed ✅
 - **Comprehensive Tests**: 17/17 passed ✅
-- **Python API Tests**: All passed ✅
+- **Python bindings tests**: All passed ✅
 
 ## 📖 Documentation
 
@@ -152,7 +152,7 @@ execute unless entity @s[type=minecraft:player,nbt={SelectedItem:{id:"minecraft:
 - ✅ Comprehensive testing completed
 - ✅ Documentation updated
 - ✅ Examples created
-- ✅ Python API support
+- ✅ Python bindings support
 - ✅ Regression tests passing
 - ✅ Backward compatibility verified
 - ✅ Error handling implemented

{minecraft_datapack_language-15.4.34/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.34
+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.34 → minecraft_datapack_language-15.4.36}/docs/_config.yml

@@ -1,5 +1,5 @@
 title: Minecraft Datapack Language (MDL) v12
-description: A powerful compiler that lets you write Minecraft datapacks in a modern JavaScript-style language (.mdl) or via a clean Python API
+description: A powerful compiler that lets you write Minecraft datapacks in a modern JavaScript-style language (.mdl) or via clean Python bindings
 url: "https://www.mcmdl.com"
 github_username: aaron777collins
 github_repo: MinecraftDatapackLanguage
@@ -68,7 +68,7 @@ nav:
     url: /docs/multi-file-projects/
   - title: CLI Reference
     url: /docs/cli-reference/
-  - title: Python API
+  - title: Python Bindings
     url: /docs/python-api/
   - title: VS Code Extension
     url: /docs/vscode-extension/

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.34 → minecraft_datapack_language-15.4.36}/docs/_docs/contributing.md

@@ -73,9 +73,9 @@ MinecraftDatapackLanguage/
 - **Configuration**: Add configuration options
 - **Integration**: Better integration with other tools
 
-### 3. Python API
+### 3. Python Bindings
 
-- **API improvements**: Enhance the Python API
+- **Bindings improvements**: Enhance the Python bindings
 - **New features**: Add new capabilities
 - **Documentation**: Improve API documentation
 - **Examples**: Add more examples
@@ -135,7 +135,7 @@ python -m pytest
 mdl --help
 mdl build --mdl sample.mdl -o test_output
 
-# Test the Python API
+# Test the Python bindings
 python -c "from minecraft_datapack_language import Pack; print('API works!')"
 ```
 

{minecraft_datapack_language-15.4.34 → minecraft_datapack_language-15.4.36}/docs/_docs/docs-hub.md

@@ -58,7 +58,7 @@ Search and browse all available documentation for the Minecraft Datapack Languag
   </div>
   
   <div class="doc-card" data-categories="python api programming">
-    <h3>🐍 Python API</h3>
+    <h3>🐍 Python Bindings</h3>
     <p>Programmatic access to MDL functionality for automation and integration.</p>
     <div class="doc-meta">
       <span class="category">API</span>

{minecraft_datapack_language-15.4.34 → minecraft_datapack_language-15.4.36}/docs/_docs/documentation.md

@@ -17,12 +17,12 @@ Welcome to the complete documentation for the Minecraft Datapack Language (MDL).
 {% assign language_ref = site.nav | where: "title", "Language Reference" | first %}
 {% assign multi_file = site.nav | where: "title", "Multi-file Projects" | first %}
 {% assign cli_ref = site.nav | where: "title", "CLI Reference" | first %}
-{% assign python_api = site.nav | where: "title", "Python API" | first %}
+{% assign python_api = site.nav | where: "title", "Python Bindings" | first %}
 
 - **[Language Reference]({{ language_ref.url }})** - Complete syntax and language features
 - **[Multi-file Projects]({{ multi_file.url }})** - How to organize and structure larger MDL projects
 - **[CLI Reference]({{ cli_ref.url }})** - Command-line interface usage and options
-- **[Python API]({{ python_api.url }})** - Programmatic access to MDL functionality
+- **[Python Bindings]({{ python_api.url }})** - Programmatic access to MDL functionality
 
 ## Tools and Extensions
 
@@ -64,7 +64,7 @@ Welcome to the complete documentation for the Minecraft Datapack Language (MDL).
   </div>
   
   <div class="doc-card">
-    <h3>🐍 Python API</h3>
+    <h3>🐍 Python Bindings</h3>
     <p>Programmatic access to MDL functionality for automation and integration.</p>
     <a href="{{ python_api.url }}" class="doc-link">API Reference →</a>
   </div>

minecraft_datapack_language-15.4.34/docs/_docs/python-api.md → minecraft_datapack_language-15.4.36/docs/_docs/python-bindings.md

@@ -1,10 +1,10 @@
 ---
 layout: page
-title: Python API
-permalink: /docs/python-api/
+title: Python Bindings
+permalink: /docs/python-bindings/
 ---
 
-The MDL Python API provides a clean, programmatic way to create Minecraft datapacks. It's fully compatible with the new JavaScript-style MDL language and supports all advanced features including variables, control flow, complex nesting, and the explicit scope system.
+The MDL Python bindings provide a clean, programmatic way to create Minecraft datapacks. They're fully compatible with the MDL language and support all advanced features including variables, control flow, complex nesting, and the explicit scope system.
 
 ## Quick Start
 
@@ -67,6 +67,36 @@ ns.function("function_name", "command1", "command2", ...)
 **Methods:**
 - `function(name, *commands)` - Add a function with commands
 
+### Control Flow and Expressions (Bindings)
+
+Bindings include helpers to compose expressions and control flow identical to MDL:
+
+```python
+from minecraft_datapack_language import Pack
+from minecraft_datapack_language.python_api import num, var_read, binop
+
+p = Pack("Control Flow", "desc", 82)
+ns = p.namespace("game")
+
+def build_logic(fb):
+    # declare variable
+    fb.declare_var("counter", "<@s>", 0)
+
+    # counter<@s> = $counter<@s>$ + 1
+    fb.set("counter", "<@s>", binop(var_read("counter", "<@s>"), "PLUS", num(1)))
+
+    # if $counter<@s>$ > 5 { say "hi" } else { say "low" }
+    cond = binop(var_read("counter", "<@s>"), "GREATER", num(5))
+    fb.if_(cond, lambda t: t.say("hi"), lambda e: e.say("low"))
+
+    # while $counter<@s>$ < 10 { counter<@s> = $counter<@s>$ + 1 }
+    wcond = binop(var_read("counter", "<@s>"), "LESS", num(10))
+    fb.while_(wcond, lambda b: b.set("counter", "<@s>", binop(var_read("counter", "<@s>"), "PLUS", num(1))))
+
+ns.function("main", build_logic)
+p.build("dist")
+```
+
 ## Basic Examples
 
 ### Hello World
@@ -121,7 +151,7 @@ def create_particle_pack():
 
 ### Variables and Control Flow
 
-The Python API supports all the advanced features of the JavaScript-style MDL language including the explicit scope system:
+The bindings support all the advanced features of the MDL language including the explicit scope system:
 
 ```python
 from minecraft_datapack_language import Pack
@@ -327,7 +357,7 @@ p.build("output_dir", wrapper="my_pack")
 
 ## Integration with MDL Files
 
-You can use the Python API alongside MDL files:
+You can use the Python bindings alongside MDL files:
 
 ```python
 from minecraft_datapack_language import Pack
@@ -340,7 +370,7 @@ def create_hybrid_pack():
     
     ast = parse_mdl_js(mdl_content)
     
-    # Create pack via Python API
+    # Create pack via Python bindings
     p = Pack("Hybrid Pack", "Combines MDL and Python", 82)
     
     # Add functions from MDL
@@ -348,7 +378,7 @@ def create_hybrid_pack():
         ns = p.namespace(func.namespace)
         ns.function(func.name, *func.commands)
     
-    # Add additional functions via Python API
+    # Add additional functions via Python bindings
     ns = p.namespace("python")
     ns.function("python_func", "say Created via Python API!")
     
@@ -505,4 +535,4 @@ if __name__ == "__main__":
     print("Complete example pack built successfully!")
 ```
 
-The Python API provides a powerful, flexible way to create Minecraft datapacks with full support for the JavaScript-style MDL language features including the new explicit scope system.
+The Python bindings provide a powerful, flexible way to create Minecraft datapacks with full support for the MDL language features including the explicit scope system.

{minecraft_datapack_language-15.4.34 → minecraft_datapack_language-15.4.36}/docs/docs.md

@@ -16,12 +16,12 @@ Welcome to the complete documentation for the Minecraft Datapack Language (MDL).
 {% assign language_ref = site.nav | where: "title", "Language Reference" | first %}
 {% assign multi_file = site.nav | where: "title", "Multi-file Projects" | first %}
 {% assign cli_ref = site.nav | where: "title", "CLI Reference" | first %}
-{% assign python_api = site.nav | where: "title", "Python API" | first %}
+{% assign python_api = site.nav | where: "title", "Python Bindings" | first %}
 
 - **[Language Reference]({{ language_ref.url }})** - Complete syntax and language features
 - **[Multi-file Projects]({{ multi_file.url }})** - How to organize and structure larger MDL projects
 - **[CLI Reference]({{ cli_ref.url }})** - Command-line interface usage and options
-- **[Python API]({{ python_api.url }})** - Programmatic access to MDL functionality
+- **[Python Bindings]({{ python_api.url }})** - Programmatic access to MDL functionality
 
 ## Tools and Extensions
 
@@ -63,7 +63,7 @@ Welcome to the complete documentation for the Minecraft Datapack Language (MDL).
   </div>
   
   <div class="doc-card">
-    <h3>🐍 Python API</h3>
+    <h3>🐍 Python Bindings</h3>
     <p>Programmatic access to MDL functionality for automation and integration.</p>
     <a href="{{ python_api.url }}" class="doc-link">API Reference →</a>
   </div>

{minecraft_datapack_language-15.4.34 → minecraft_datapack_language-15.4.36}/docs/index.md

@@ -74,13 +74,13 @@ A **modern JavaScript-style compiler** that lets you write Minecraft datapacks w
     <a href="{{ site.baseurl }}/docs/multi-file-projects/" class="doc-link">Learn More →</a>
   </div>
   <div class="doc-card">
-    <h3>🐍 Python API</h3>
+    <h3>🐍 Python Bindings</h3>
     <p>Programmatic datapack creation</p>
     <div class="doc-meta">
       <span class="category">API</span>
       <span class="category">Python</span>
     </div>
-    <a href="{{ site.baseurl }}/docs/python-api/" class="doc-link">Python API →</a>
+    <a href="{{ site.baseurl }}/docs/python-bindings/" class="doc-link">Python Bindings →</a>
   </div>
 </div>
 

{minecraft_datapack_language-15.4.34 → minecraft_datapack_language-15.4.36}/minecraft_datapack_language/__init__.py

@@ -3,6 +3,7 @@ from .mdl_lexer import MDLLexer, Token, TokenType
 from .mdl_parser import MDLParser
 from .ast_nodes import *
 from .dir_map import DirMap
+from .python_api import Pack
 
 __all__ = [
     "MDLLexer", "Token", "TokenType",
@@ -13,7 +14,8 @@ __all__ = [
     "SayCommand", "TellrawCommand", "ExecuteCommand", "ScoreboardCommand",
     "BinaryExpression", "UnaryExpression", "ParenthesizedExpression", "LiteralExpression",
     "ScopeSelector",
-    "DirMap"
+    "DirMap",
+    "Pack"
 ]
 
 # CLI entry point

{minecraft_datapack_language-15.4.34 → 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.34'
-__version_tuple__ = version_tuple = (15, 4, 34)
+__version__ = version = '15.4.36'
+__version_tuple__ = version_tuple = (15, 4, 36)
 
-__commit_id__ = commit_id = 'g600f6b0c4'
+__commit_id__ = commit_id = 'g68a65e479'

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

@@ -148,22 +148,25 @@ 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
+        self.if_counter = 0
+        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)
     
@@ -395,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)
@@ -413,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:
@@ -437,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)
@@ -455,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
@@ -477,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)
@@ -497,10 +515,10 @@ class MDLCompiler:
                 loop_body_lines.append(cmd)
         
         # Add the recursive call at the end to continue the loop
-        if self._is_scoreboard_condition(while_loop.condition):
-            loop_body_lines.append(f"execute if score {condition} run function {self.current_namespace}:{loop_function_name}")
-        else:
-            loop_body_lines.append(f"execute if {condition} run function {self.current_namespace}:{loop_function_name}")
+        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)
@@ -517,24 +535,21 @@ class MDLCompiler:
     
     def _generate_if_function_name(self) -> str:
         """Generate a unique name for an if function."""
-        if not hasattr(self, 'if_counter'):
-            self.if_counter = 0
         self.if_counter += 1
-        return f"if_{self.if_counter}"
+        prefix = getattr(self, '_current_function_name', 'fn')
+        return f"{prefix}__if_{self.if_counter}"
     
     def _generate_else_function_name(self) -> str:
         """Generate a unique name for an else function."""
-        if not hasattr(self, 'else_counter'):
-            self.else_counter = 0
         self.else_counter += 1
-        return f"else_{self.else_counter}"
+        prefix = getattr(self, '_current_function_name', 'fn')
+        return f"{prefix}__else_{self.else_counter}"
     
     def _generate_while_function_name(self) -> str:
         """Generate a unique name for a while function."""
-        if not hasattr(self, 'while_counter'):
-            self.while_counter = 0
         self.while_counter += 1
-        return f"while_{self.while_counter}"
+        prefix = getattr(self, '_current_function_name', 'fn')
+        return f"{prefix}__while_{self.while_counter}"
     
     def _store_generated_function(self, name: str, lines: List[str]):
         """Store a generated function as a separate file under the same namespace."""
@@ -679,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}")
                 
@@ -690,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}")
                 
@@ -701,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:
@@ -716,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:
@@ -731,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."""