minecraft-datapack-language 16.0.14__py3-none-any.whl → 16.0.16__py3-none-any.whl

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.16'
+__version_tuple__ = version_tuple = (16, 0, 16)
 
 __commit_id__ = commit_id = None

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)
@@ -930,6 +945,25 @@ class MDLCompiler:
                 if op_sym == "!=":
                     # Use equals with inversion
                     return (f"score {lscope} {lobj} = {rscope} {robj}", True)
+
+            # General scoreboard vs scoreboard (covers temps produced by BinaryExpression)
+            if op_sym:
+                try:
+                    left_val = self._expression_to_value(left)
+                    right_val = self._expression_to_value(right)
+                except Exception:
+                    left_val = None
+                    right_val = None
+                if isinstance(left_val, str) and left_val.startswith("score ") and isinstance(right_val, str) and right_val.startswith("score "):
+                    lparts = left_val.split()
+                    rparts = right_val.split()
+                    if len(lparts) >= 3 and len(rparts) >= 3:
+                        lscope, lobj = lparts[1], lparts[2]
+                        rscope, robj = rparts[1], rparts[2]
+                        if op_sym == "!=":
+                            return (f"score {lscope} {lobj} = {rscope} {robj}", True)
+                        comp = op_sym if op_sym != "==" else "="
+                        return (f"score {lscope} {lobj} {comp} {rscope} {robj}", False)
         
         # Fallback: treat as generic condition string
         return (self._expression_to_condition(expression), False)

{minecraft_datapack_language-16.0.14.dist-info → minecraft_datapack_language-16.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.14
+Version: 16.0.16
 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.dist-info → minecraft_datapack_language-16.0.16.dist-info}/RECORD

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=gzXobEdwW19w9dKSP9heKx935VDlTBc_KDRK74zvMvY,708
+minecraft_datapack_language/_version.py,sha256=d04fOD3hne3CIblJtZJsJY9-QzwsZ1sOB7PzgWLaDWM,708
 minecraft_datapack_language/ast_nodes.py,sha256=L5izavSeXDr766vsfRvJrcnflXNJyXcy0WSfyJPq2ZA,4484
 minecraft_datapack_language/cli.py,sha256=R4QZYtox-Da9B8pr_kCg_9qc9aI-ORTah7kMkhsI5tw,10373
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=XnwT2M6-qVLPSh36BNOnUNpODQYlMegRTFycIEqjrSk,54097
+minecraft_datapack_language/mdl_compiler.py,sha256=5lBvLpBbB90SVg1i10oAkeRVYhVDfeBvbJXONoSgAUE,55612
 minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
 minecraft_datapack_language/mdl_lexer.py,sha256=bDzAj39-kfnX0uVlYQg1oQ7YDb-JO9UZx8jbODQqg6E,23902
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
 minecraft_datapack_language/mdl_parser.py,sha256=Krk7Y_E9OKNCcsDOCT7ATvQLbJII951AU2qzEY00GLE,26068
 minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-16.0.14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.14.dist-info/METADATA,sha256=ea-Agrnwv9H6nt-UrkHVdeTIh0fNOhGhKGAhDqgibSs,8344
-minecraft_datapack_language-16.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.14.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.14.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.14.dist-info/RECORD,,
+minecraft_datapack_language-16.0.16.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.16.dist-info/METADATA,sha256=LLHp-JLyIvV2l7sVIhwgKk_i4NX1S9PRxR-trcER4Zc,8344
+minecraft_datapack_language-16.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.16.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.16.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.16.dist-info/RECORD,,