minecraft-datapack-language 16.0.22__py3-none-any.whl → 16.0.23__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.22'
-__version_tuple__ = version_tuple = (16, 0, 22)
+__version__ = version = '16.0.23'
+__version_tuple__ = version_tuple = (16, 0, 23)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/mdl_compiler.py

@@ -324,9 +324,8 @@ class MDLCompiler:
             if getattr(decl, 'initial_value', None) is None:
                 continue
             objective = self.variables.get(decl.name, decl.name)
-            scope = decl.scope.strip("<>") if decl.scope else "@a"
-            if scope == "@s":
-                scope = "@a"
+            resolved_scope = self._resolve_scope(decl.scope) if decl.scope else "@a"
+            scope = "@a" if resolved_scope == "@s" else resolved_scope
             init = decl.initial_value
             from .ast_nodes import LiteralExpression, VariableSubstitution
             if isinstance(init, LiteralExpression):
@@ -340,9 +339,8 @@ class MDLCompiler:
                 lines.append(f"scoreboard players set {scope} {objective} {val_str}")
             elif isinstance(init, VariableSubstitution):
                 src_obj = self.variables.get(init.name, init.name)
-                src_scope = init.scope.strip("<>") if init.scope else "@a"
-                if src_scope == "@s":
-                    src_scope = "@a"
+                src_resolved = self._resolve_scope(init.scope) if init.scope else "@a"
+                src_scope = "@a" if src_resolved == "@s" else src_resolved
                 lines.append(f"scoreboard players operation {scope} {objective} = {src_scope} {src_obj}")
 
         lines.append("")
@@ -404,7 +402,7 @@ class MDLCompiler:
         if assignment.name not in self.variables:
             self.variables[assignment.name] = assignment.name
         objective = self.variables.get(assignment.name, assignment.name)
-        scope = assignment.scope.strip("<>")
+        scope = self._resolve_scope(assignment.scope)
         
         # Check if the value is a complex expression
         if isinstance(assignment.value, BinaryExpression):
@@ -435,7 +433,7 @@ class MDLCompiler:
         # Register objective so load function adds it
         self.variables[decl.name] = objective
         # If there is an initial value, set it in current context
-        scope = decl.scope.strip("<>")
+        scope = self._resolve_scope(decl.scope)
         init = None
         try:
             init = self._expression_to_value(decl.initial_value)
@@ -474,7 +472,7 @@ class MDLCompiler:
                     parts.append(f'{{"text":"{text_before}"}}')
                 
                 objective = self.variables.get(var.name, var.name)
-                scope = var.scope.strip("<>")
+                scope = self._resolve_scope(var.scope)
                 parts.append(f'{{"score":{{"name":"{scope}","objective":"{objective}"}}}}')
                 
                 current_pos = var_pos + len(var_pattern)

{minecraft_datapack_language-16.0.22.dist-info → minecraft_datapack_language-16.0.23.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=_tG4EfcAQU_oUaGDm8V7BAdOABVjLoevYy8mcW2KyRc,708
+minecraft_datapack_language/_version.py,sha256=eWTNBh-P4HhLgybIHAOAGijWNHcasRe4IaGpZ8W0Ess,708
 minecraft_datapack_language/ast_nodes.py,sha256=L5izavSeXDr766vsfRvJrcnflXNJyXcy0WSfyJPq2ZA,4484
 minecraft_datapack_language/cli.py,sha256=shmQtNNXgw5XNlGquAR52wWtYeNyYusZTwwCZl56mMU,9522
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=-nqxEbo6Pk_zo8cMDKmkIhz8vOVIRGqoESWHSgDOmD8,70118
+minecraft_datapack_language/mdl_compiler.py,sha256=DRE6du7JRScZo8NRIGN9hF0CkDPeHspsKaYXNL8ZPRc,70187
 minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
 minecraft_datapack_language/mdl_lexer.py,sha256=YuRflOkoMOcjECPAZzoAkJciMks5amWMtGbcTIVKmAs,24166
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
 minecraft_datapack_language/mdl_parser.py,sha256=vIcPRudxDaezNy85Q5CBcumLhCglofCNITsrRmj9YWw,27302
 minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-16.0.22.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.22.dist-info/METADATA,sha256=UYsoFBSRS9ac_e5unDb5Nf1b5eev7QVf3fLY9W1W2X8,8344
-minecraft_datapack_language-16.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.22.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.22.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.22.dist-info/RECORD,,
+minecraft_datapack_language-16.0.23.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.23.dist-info/METADATA,sha256=hEDfmoYVnMwMaVIVVT86YmaV1fqS4uDSweWNLkqLz0E,8344
+minecraft_datapack_language-16.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.23.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.23.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.23.dist-info/RECORD,,