minecraft-datapack-language 16.0.19__tar.gz → 16.0.20__tar.gz

{minecraft_datapack_language-16.0.19 → minecraft_datapack_language-16.0.20}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "16.0.19"
+tag: "v16.0.19"
+updated_at: "2025-09-10T05:46:41Z"

{minecraft_datapack_language-16.0.19 → minecraft_datapack_language-16.0.20}/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.19'
-__version_tuple__ = version_tuple = (16, 0, 19)
+__version__ = version = '16.0.20'
+__version_tuple__ = version_tuple = (16, 0, 20)
 
-__commit_id__ = commit_id = 'gabc769e06'
+__commit_id__ = commit_id = 'g16beed4e1'

{minecraft_datapack_language-16.0.19 → minecraft_datapack_language-16.0.20}/minecraft_datapack_language/mdl_compiler.py

@@ -1137,7 +1137,8 @@ class MDLCompiler:
                     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}")
+                    lit = self._normalize_integer_literal_string(str(left_value), ctx="addition left operand")
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {lit}")
             # Add right value
             if isinstance(expression.right, VariableSubstitution) or (isinstance(right_value, str) and right_value.startswith("score ")):
                 parts = str(right_value).split()
@@ -1145,7 +1146,13 @@ class MDLCompiler:
                 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}")
+                lit = self._normalize_integer_literal_string(str(right_value), ctx="addition right operand")
+                if lit == "0":
+                    pass
+                elif lit.startswith("-"):
+                    self._store_temp_command(f"scoreboard players remove @s {temp_var} {lit[1:]}")
+                else:
+                    self._store_temp_command(f"scoreboard players add @s {temp_var} {lit}")
                 
         elif expression.operator == "MINUS":
             if isinstance(expression.left, BinaryExpression):
@@ -1157,7 +1164,8 @@ class MDLCompiler:
                     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}")
+                    lit = self._normalize_integer_literal_string(str(left_value), ctx="subtraction left operand")
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {lit}")
             # Subtract right value
             if isinstance(expression.right, VariableSubstitution) or (isinstance(right_value, str) and right_value.startswith("score ")):
                 parts = str(right_value).split()
@@ -1165,7 +1173,14 @@ class MDLCompiler:
                 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}")
+                lit = self._normalize_integer_literal_string(str(right_value), ctx="subtraction right operand")
+                if lit == "0":
+                    pass
+                elif lit.startswith("-"):
+                    # x - (-k) == x + k
+                    self._store_temp_command(f"scoreboard players add @s {temp_var} {lit[1:]}")
+                else:
+                    self._store_temp_command(f"scoreboard players remove @s {temp_var} {lit}")
                 
         elif expression.operator == "MULTIPLY":
             if isinstance(expression.left, BinaryExpression):
@@ -1185,8 +1200,13 @@ class MDLCompiler:
                 # For literal values, keep explicit multiply command for compatibility
                 if isinstance(expression.right, LiteralExpression):
                     # Normalize number formatting (e.g., 2.0 -> 2)
-                    literal_str = self._expression_to_value(expression.right)
-                    self._store_temp_command(f"scoreboard players multiply @s {temp_var} {literal_str}")
+                    literal_str = self._normalize_integer_literal_string(self._expression_to_value(expression.right), ctx="multiply literal")
+                    if literal_str == "0":
+                        self._store_temp_command(f"scoreboard players set @s {temp_var} 0")
+                    elif literal_str == "1":
+                        pass
+                    else:
+                        self._store_temp_command(f"scoreboard players multiply @s {temp_var} {literal_str}")
                 else:
                     # If right_value is a score reference string, strip the leading 'score '
                     if isinstance(right_value, str) and right_value.startswith("score "):
@@ -1198,7 +1218,17 @@ class MDLCompiler:
                         else:
                             self._store_temp_command(f"scoreboard players operation @s {temp_var} *= {right_value}")
                     else:
-                        self._store_temp_command(f"scoreboard players operation @s {temp_var} *= {right_value}")
+                        # If RHS is a numeric literal string (incl. negatives), use multiply
+                        if self._is_numeric_literal_string(right_value):
+                            lit = self._normalize_integer_literal_string(str(right_value), ctx="multiply literal string")
+                            if lit == "0":
+                                self._store_temp_command(f"scoreboard players set @s {temp_var} 0")
+                            elif lit == "1":
+                                pass
+                            else:
+                                self._store_temp_command(f"scoreboard players multiply @s {temp_var} {lit}")
+                        else:
+                            self._store_temp_command(f"scoreboard players operation @s {temp_var} *= {right_value}")
                 
         elif expression.operator == "DIVIDE":
             if isinstance(expression.left, BinaryExpression):
@@ -1218,8 +1248,17 @@ class MDLCompiler:
                 # For literal values, keep explicit divide command for compatibility
                 if isinstance(expression.right, LiteralExpression):
                     # Normalize number formatting (e.g., 2.0 -> 2)
-                    literal_str = self._expression_to_value(expression.right)
-                    self._store_temp_command(f"scoreboard players divide @s {temp_var} {literal_str}")
+                    lit = self._normalize_integer_literal_string(self._expression_to_value(expression.right), ctx="divide literal")
+                    if lit == "0":
+                        raise MDLCompilerError("Division by zero literal is not allowed", "Use a non-zero integer literal")
+                    if lit == "1":
+                        pass
+                    elif lit.startswith("-"):
+                        abs_lit = lit[1:]
+                        self._store_temp_command(f"scoreboard players divide @s {temp_var} {abs_lit}")
+                        self._store_temp_command(f"scoreboard players multiply @s {temp_var} -1")
+                    else:
+                        self._store_temp_command(f"scoreboard players divide @s {temp_var} {lit}")
                 else:
                     # If right_value is a score reference string, strip the leading 'score '
                     if isinstance(right_value, str) and right_value.startswith("score "):
@@ -1231,7 +1270,21 @@ class MDLCompiler:
                         else:
                             self._store_temp_command(f"scoreboard players operation @s {temp_var} /= {right_value}")
                     else:
-                        self._store_temp_command(f"scoreboard players operation @s {temp_var} /= {right_value}")
+                        # If RHS is a numeric literal string (incl. negatives), use divide
+                        if self._is_numeric_literal_string(right_value):
+                            lit = self._normalize_integer_literal_string(str(right_value), ctx="divide literal string")
+                            if lit == "0":
+                                raise MDLCompilerError("Division by zero literal is not allowed", "Use a non-zero integer literal")
+                            if lit == "1":
+                                pass
+                            elif lit.startswith("-"):
+                                abs_lit = lit[1:]
+                                self._store_temp_command(f"scoreboard players divide @s {temp_var} {abs_lit}")
+                                self._store_temp_command(f"scoreboard players multiply @s {temp_var} -1")
+                            else:
+                                self._store_temp_command(f"scoreboard players divide @s {temp_var} {lit}")
+                        else:
+                            self._store_temp_command(f"scoreboard players operation @s {temp_var} /= {right_value}")
         else:
             # For other operators, just set the value
             self._store_temp_command(f"scoreboard players set @s {temp_var} 0")
@@ -1243,6 +1296,36 @@ class MDLCompiler:
         else:
             # Fallback: do nothing, but keep behavior predictable
             pass
+
+    def _is_numeric_literal_string(self, s: Any) -> bool:
+        """Return True if s is a string representing an integer literal (incl. negatives)."""
+        if not isinstance(s, str):
+            return False
+        try:
+            # Allow floats that are integer-valued like "2.0" by casting then checking is_integer
+            if "." in s:
+                f = float(s)
+                return f.is_integer()
+            int(s)
+            return True
+        except Exception:
+            return False
+
+    def _normalize_integer_literal_string(self, s: str, ctx: str = "") -> str:
+        """Normalize a numeric literal string to an integer string, or raise MDLCompilerError.
+        Accepts negatives and floats that are mathematically integers (e.g., "2.0").
+        """
+        try:
+            f = float(s)
+        except Exception:
+            raise MDLCompilerError(f"Expected integer literal, got '{s}'", f"Invalid numeric literal in {ctx}")
+        if not float(f).is_integer():
+            raise MDLCompilerError(f"Scoreboards are integer-only; got non-integer '{s}'", f"Use integers in {ctx}")
+        n = int(f)
+        # Normalize -0 to 0
+        if n == 0:
+            return "0"
+        return str(n)
     
     def _generate_temp_variable_name(self) -> str:
         """Generate a unique temporary variable name."""

{minecraft_datapack_language-16.0.19 → minecraft_datapack_language-16.0.20}/minecraft_datapack_language.egg-info/PKG-INFO

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

@@ -374,6 +374,7 @@ temp_output/data/test/function/main.mcfunction
 test_project/complex_test.mdl
 tests/__init__.py
 tests/run_all_tests.py
+tests/test_arithmetic_codegen.py
 tests/test_cli.py
 tests/test_codegen_naming_and_logic.py
 tests/test_compiler_fixes.py

minecraft_datapack_language-16.0.20/tests/test_arithmetic_codegen.py

@@ -0,0 +1,80 @@
+import os
+import re
+import pytest
+from minecraft_datapack_language.mdl_parser import MDLParser
+from minecraft_datapack_language.mdl_compiler import MDLCompiler
+from minecraft_datapack_language.mdl_errors import MDLCompilerError
+
+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 test_add_remove_literal(tmp_path):
+    src = '''
+pack "p" "d" 82;
+namespace "p";
+function p:f {
+    var x<@s> = 1;
+    x<@s> = $x<@s>$ + 5;
+    x<@s> = $x<@s>$ + -3;
+}
+'''
+    out = compile_snippet(src, str(tmp_path))
+    # find function file under either 'functions' or 'function'
+    candidates = [
+        os.path.join(out, "data", "p", "functions", "f.mcfunction"),
+        os.path.join(out, "data", "p", "function", "f.mcfunction"),
+    ]
+    for fn in candidates:
+        if os.path.exists(fn):
+            break
+    else:
+        raise FileNotFoundError("f.mcfunction not found in expected directories")
+    text = open(fn, "r", encoding="utf-8").read()
+    # We compile via temps: expect add/remove on a temp variable, not directly on x
+    assert re.search(r"players add @s (temp_\\d+|x) 5", text) is not None
+    assert re.search(r"players (remove|add) @s (temp_\\d+|x) 3", text) is not None
+
+def test_multiply_divide_literal(tmp_path):
+    src = '''
+pack "p" "d" 82;
+namespace "p";
+function p:f {
+    var x<@s> = 2;
+    x<@s> = $x<@s>$ * 3;
+    x<@s> = $x<@s>$ * -1;
+    x<@s> = $x<@s>$ / 2;
+}
+'''
+    out = compile_snippet(src, str(tmp_path))
+    candidates = [
+        os.path.join(out, "data", "p", "functions", "f.mcfunction"),
+        os.path.join(out, "data", "p", "function", "f.mcfunction"),
+    ]
+    for fn in candidates:
+        if os.path.exists(fn):
+            break
+    else:
+        raise FileNotFoundError("f.mcfunction not found in expected directories")
+    text = open(fn, "r", encoding="utf-8").read()
+    assert re.search(r"players multiply @s (temp_\\d+|x) 3", text) is not None
+    assert re.search(r"players multiply @s (temp_\\d+|x) -1", text) is not None
+    assert re.search(r"players divide @s (temp_\\d+|x) 2", text) is not None
+
+def test_divide_by_zero_error(tmp_path):
+    src = '''
+pack "p" "d" 82;
+namespace "p";
+function p:f {
+    var x<@s> = 2;
+    x<@s> = $x<@s>$ / 0;
+}
+'''
+    with pytest.raises(MDLCompilerError) as ei:
+        compile_snippet(src, str(tmp_path))
+    msg = str(ei.value).lower()
+    assert ("divide" in msg) or ("division" in msg) or ("integer" in msg)
+
+

minecraft_datapack_language-16.0.19/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "16.0.18"
-tag: "v16.0.18"
-updated_at: "2025-09-10T05:13:53Z"