minecraft-datapack-language 16.0.14__tar.gz → 16.0.15__tar.gz

{minecraft_datapack_language-16.0.14/minecraft_datapack_language.egg-info → minecraft_datapack_language-16.0.15}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "16.0.14"
+tag: "v16.0.14"
+updated_at: "2025-09-10T04:04:51Z"

{minecraft_datapack_language-16.0.14 → minecraft_datapack_language-16.0.15}/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.14'
-__version_tuple__ = version_tuple = (16, 0, 14)
+__version__ = version = '16.0.15'
+__version_tuple__ = version_tuple = (16, 0, 15)
 
-__commit_id__ = commit_id = 'g4a67b89f7'
+__commit_id__ = commit_id = 'g86e8af6ba'

{minecraft_datapack_language-16.0.14 → minecraft_datapack_language-16.0.15}/minecraft_datapack_language/mdl_compiler.py

@@ -819,12 +819,58 @@ class MDLCompiler:
         else:
             return str(expression)
     
+    def _normalize_operator(self, op_in: Any) -> Optional[str]:
+        """Normalize operator tokens/strings to Minecraft execute/scoreboard symbols.
+        Returns one of: '>', '>=', '<', '<=', '==', '!=' or None if unknown.
+        """
+        # Direct symbol passthrough
+        if op_in in ('>', '>=', '<', '<=', '==', '!='):
+            return op_in
+        # TokenType instances
+        try:
+            if op_in == TokenType.GREATER:
+                return '>'
+            if op_in == TokenType.GREATER_EQUAL:
+                return '>='
+            if op_in == TokenType.LESS:
+                return '<'
+            if op_in == TokenType.LESS_EQUAL:
+                return '<='
+            if op_in == TokenType.EQUAL:
+                return '=='
+            if op_in == TokenType.NOT_EQUAL:
+                return '!='
+        except Exception:
+            pass
+        # String names from bindings or parser
+        if isinstance(op_in, str):
+            upper = op_in.upper()
+            if upper == 'GREATER':
+                return '>'
+            if upper == 'GREATER_EQUAL':
+                return '>='
+            if upper == 'LESS':
+                return '<'
+            if upper == 'LESS_EQUAL':
+                return '<='
+            if upper == 'EQUAL' or upper == 'EQ':
+                return '=='
+            if upper == 'NOT_EQUAL' or upper == 'NE':
+                return '!='
+        return None
+    
     def _expression_to_condition(self, expression: Any) -> str:
         """Legacy: Convert expression to a naive condition string (internal use)."""
         if isinstance(expression, BinaryExpression):
             left = self._expression_to_value(expression.left)
             right = self._expression_to_value(expression.right)
-            return f"{left} {expression.operator} {right}"
+            op_sym = self._normalize_operator(expression.operator)
+            # Minecraft scoreboard uses '=' instead of '=='
+            if op_sym == '==':
+                op_text = '='
+            else:
+                op_text = op_sym if op_sym is not None else str(expression.operator)
+            return f"{left} {op_text} {right}"
         else:
             return self._expression_to_value(expression)
 
@@ -841,41 +887,10 @@ class MDLCompiler:
                 e = e.expression
             return e
 
-        def norm_op(op_in: Any) -> Optional[str]:
-            # Return one of: '>', '>=', '<', '<=', '==', '!=' or None
-            if op_in == TokenType.GREATER or op_in == ">":
-                return ">"
-            if op_in == TokenType.GREATER_EQUAL or op_in == ">=":
-                return ">="
-            if op_in == TokenType.LESS or op_in == "<":
-                return "<"
-            if op_in == TokenType.LESS_EQUAL or op_in == "<=":
-                return "<="
-            if op_in == TokenType.EQUAL or op_in == "==" or op_in == "EQUAL":
-                return "=="
-            if op_in == TokenType.NOT_EQUAL or op_in == "!=" or op_in == "NOT_EQUAL":
-                return "!="
-            # Accept python bindings string names as well
-            if isinstance(op_in, str):
-                upper = op_in.upper()
-                if upper == "GREATER":
-                    return ">"
-                if upper == "GREATER_EQUAL":
-                    return ">="
-                if upper == "LESS":
-                    return "<"
-                if upper == "LESS_EQUAL":
-                    return "<="
-                if upper == "EQUAL":
-                    return "=="
-                if upper == "NOT_EQUAL":
-                    return "!="
-            return None
-
         if isinstance(expression, BinaryExpression):
             left = unwrap(expression.left)
             right = unwrap(expression.right)
-            op_sym = norm_op(expression.operator)
+            op_sym = self._normalize_operator(expression.operator)
             # Variable vs literal
             if op_sym and isinstance(left, VariableSubstitution) and isinstance(right, LiteralExpression) and isinstance(right.value, (int, float)):
                 objective = self.variables.get(left.name, left.name)

{minecraft_datapack_language-16.0.14 → minecraft_datapack_language-16.0.15/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.14
+Version: 16.0.15
 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.14 → minecraft_datapack_language-16.0.15}/tests/test_python_bindings.py

@@ -56,3 +56,56 @@ def test_bindings_complex_expression():
         # Temp ops are inlined now; footer removed
         assert 'temp_' in text
 
+
+def test_bindings_equality_and_inequality_symbols():
+    p = Pack("Bindings3", "desc", 82)
+    ns = p.namespace("cmp")
+
+    def build(fb):
+        fb.declare_var("a", "<@s>", 1)
+        fb.declare_var("b", "<@s>", 1)
+        # Use symbol operators that previously leaked into output
+        cond_eq = binop(var_read("a", "<@s>"), "==", var_read("b", "<@s>"))
+        fb.if_(cond_eq, lambda t: t.say("eq"), lambda e: e.say("neq"))
+        cond_ne = binop(var_read("a", "<@s>"), "!=", var_read("b", "<@s>"))
+        fb.if_(cond_ne, lambda t: t.say("ne_true"), lambda e: e.say("ne_false"))
+
+    ns.function("main", build)
+
+    with tempfile.TemporaryDirectory() as td:
+        p.build(td)
+        func = Path(td) / 'data' / 'cmp' / 'function'
+        main = (func / 'main.mcfunction').read_text()
+        # Equality should map to '=' and inequality should invert the execute
+        assert 'execute if score @s a = @s b' in main
+        assert 'execute unless score @s a = @s b' in main
+        # Ensure invalid raw operators are not present
+        assert '==' not in main
+        assert '!=' not in main
+
+
+def test_bindings_equality_literal_and_not_equal_word():
+    p = Pack("Bindings4", "desc", 82)
+    ns = p.namespace("lit")
+
+    def build(fb):
+        fb.declare_var("x", "<@s>", 5)
+        # Symbol equality against literal and word-form NOT_EQUAL
+        cond_eq = binop(var_read("x", "<@s>"), "==", num(5))
+        fb.if_(cond_eq, lambda t: t.say("is5"))
+        cond_ne = binop(var_read("x", "<@s>"), "NOT_EQUAL", num(7))
+        fb.if_(cond_ne, lambda t: t.say("not7"))
+
+    ns.function("main", build)
+
+    with tempfile.TemporaryDirectory() as td:
+        p.build(td)
+        func = Path(td) / 'data' / 'lit' / 'function'
+        main = (func / 'main.mcfunction').read_text()
+        # Equality to literal uses matches N
+        assert 'execute if score @s x matches 5' in main
+        # Not equal to literal uses unless matches N
+        assert 'execute unless score @s x matches 7' in main
+        # Ensure invalid raw operators are not present
+        assert '==' not in main
+        assert '!=' not in main

minecraft_datapack_language-16.0.14/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "16.0.13"
-tag: "v16.0.13"
-updated_at: "2025-09-09T06:19:59Z"