minecraft-datapack-language 16.0.13__py3-none-any.whl → 16.0.15__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.13'
-__version_tuple__ = version_tuple = (16, 0, 13)
+__version__ = version = '16.0.15'
+__version_tuple__ = version_tuple = (16, 0, 15)
 
 __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)
 
@@ -835,12 +881,18 @@ class MDLCompiler:
         # Default: generic expression string, no inversion
         invert_then = False
         
+        # Helpers local to this method to keep concerns contained
+        def unwrap(e: Any) -> Any:
+            while isinstance(e, ParenthesizedExpression):
+                e = e.expression
+            return e
+
         if isinstance(expression, BinaryExpression):
-            left = expression.left
-            right = expression.right
-            op = expression.operator
+            left = unwrap(expression.left)
+            right = unwrap(expression.right)
+            op_sym = self._normalize_operator(expression.operator)
             # Variable vs literal
-            if isinstance(left, VariableSubstitution) and isinstance(right, LiteralExpression) and isinstance(right.value, (int, float)):
+            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)
                 scope = left.scope.strip("<>")
                 # Normalize number
@@ -850,41 +902,47 @@ class MDLCompiler:
                     v = None
                 if v is not None:
                     n = int(v) if float(v).is_integer() else v
-                    if op == TokenType.GREATER:
+                    if op_sym == ">":
                         rng = f"{int(n)+1}.." if isinstance(n, int) else f"{v+1}.."
                         return (f"score {scope} {objective} matches {rng}", False)
-                    if op == TokenType.GREATER_EQUAL:
+                    if op_sym == ">=":
                         rng = f"{int(n)}.."
                         return (f"score {scope} {objective} matches {rng}", False)
-                    if op == TokenType.LESS:
+                    if op_sym == "<":
                         rng = f"..{int(n)-1}"
                         return (f"score {scope} {objective} matches {rng}", False)
-                    if op == TokenType.LESS_EQUAL:
+                    if op_sym == "<=":
                         rng = f"..{int(n)}"
                         return (f"score {scope} {objective} matches {rng}", False)
-                    if op == TokenType.EQUAL:
+                    if op_sym == "==":
                         rng = f"{int(n)}"
                         return (f"score {scope} {objective} matches {rng}", False)
-                    if op == TokenType.NOT_EQUAL:
+                    if op_sym == "!=":
                         rng = f"{int(n)}"
                         return (f"score {scope} {objective} matches {rng}", True)
+            # Literal vs variable (swap sides)
+            if op_sym and isinstance(left, LiteralExpression) and isinstance(left.value, (int, float)) and isinstance(right, VariableSubstitution):
+                # Swap by inverting the operator appropriately, then reuse logic
+                invert_map = {
+                    ">": "<",
+                    ">=": "<=",
+                    "<": ">",
+                    "<=": ">=",
+                    "==": "==",
+                    "!=": "!="
+                }
+                swapped = BinaryExpression(left=right, operator=invert_map.get(op_sym, op_sym), right=left)
+                return self._build_condition(swapped)
             # Variable vs variable
-            if isinstance(left, VariableSubstitution) and isinstance(right, VariableSubstitution):
+            if op_sym and isinstance(left, VariableSubstitution) and isinstance(right, VariableSubstitution):
                 lobj = self.variables.get(left.name, left.name)
                 lscope = left.scope.strip("<>")
                 robj = self.variables.get(right.name, right.name)
                 rscope = right.scope.strip("<>")
-                if op in (TokenType.GREATER, TokenType.GREATER_EQUAL, TokenType.LESS, TokenType.LESS_EQUAL, TokenType.EQUAL):
-                    comp_map = {
-                        TokenType.GREATER: ">",
-                        TokenType.GREATER_EQUAL: ">=",
-                        TokenType.LESS: "<",
-                        TokenType.LESS_EQUAL: "<=",
-                        TokenType.EQUAL: "="
-                    }
-                    comp = comp_map[op]
+                if op_sym in (">", ">=", "<", "<=", "=="):
+                    comp = op_sym if op_sym != "==" else "="
                     return (f"score {lscope} {lobj} {comp} {rscope} {robj}", False)
-                if op == TokenType.NOT_EQUAL:
+                if op_sym == "!=":
                     # Use equals with inversion
                     return (f"score {lscope} {lobj} = {rscope} {robj}", True)
         

{minecraft_datapack_language-16.0.13.dist-info → minecraft_datapack_language-16.0.15.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=zPid2C66t3qy7IALtBamczEZhSi2TvHUc9FEEgCFwOc,708
+minecraft_datapack_language/_version.py,sha256=K7VsHAmJlEhd8XJV9-Y3WI0coNAa98VyEMvOhlue3zI,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=-ZwjHgJ8jJej8iiMovkbE8ry0aiLmXHc5rJ5Agj3Ep4,52293
+minecraft_datapack_language/mdl_compiler.py,sha256=OuCk3SSPj4Cac5dYihWL6Nd-y5H4T5LGlCh55bGUkts,54538
 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.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.13.dist-info/METADATA,sha256=0JbN_CstF60oTN4ypgfcq1JbLE0Q2nO3dcL_NWfioS8,8344
-minecraft_datapack_language-16.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.13.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.13.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.13.dist-info/RECORD,,
+minecraft_datapack_language-16.0.15.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.15.dist-info/METADATA,sha256=IFwvyBTp7KpUGsHgWff_iK5Oo6TBR1pVLxh-xW0HUPc,8344
+minecraft_datapack_language-16.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.15.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.15.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.15.dist-info/RECORD,,