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

minecraft_datapack_language/mdl_compiler.py

@@ -463,10 +463,15 @@ class MDLCompiler:
         current_pos = 0
         
         for var in variables:
-            var_pattern = f"${var.name}{var.scope}$"
-            var_pos = message.find(var_pattern, current_pos)
-            
-            if var_pos != -1:
+            # Support both $name<scope>$ and $name$ forms; parser already defaults scope to <@s>
+            with_scope = f"${var.name}{var.scope}$"
+            no_scope = f"${var.name}$"
+            pos_with = message.find(with_scope, current_pos)
+            pos_no = message.find(no_scope, current_pos)
+            # Choose the earliest valid occurrence >= current_pos
+            candidates = [p for p in [pos_with, pos_no] if p != -1]
+            if candidates:
+                var_pos = min(candidates)
                 if var_pos > current_pos:
                     text_before = message[current_pos:var_pos]
                     parts.append(f'{{"text":"{text_before}"}}')
@@ -475,7 +480,11 @@ class MDLCompiler:
                 scope = self._resolve_scope(var.scope)
                 parts.append(f'{{"score":{{"name":"{scope}","objective":"{objective}"}}}}')
                 
-                current_pos = var_pos + len(var_pattern)
+                # Advance past whichever token we matched
+                if var_pos == pos_with:
+                    current_pos = var_pos + len(with_scope)
+                else:
+                    current_pos = var_pos + len(no_scope)
         
         if current_pos < len(message):
             text_after = message[current_pos:]

minecraft_datapack_language/mdl_parser.py

@@ -181,14 +181,17 @@ class MDLParser:
                        "Use: recipe, loot_table, advancement, item_modifier, predicate, or structure")
     
     def _parse_variable_declaration(self) -> VariableDeclaration:
-        """Parse variable declaration: var num name<scope> = value;"""
+        """Parse variable declaration: var num name<scope?> = value; defaults to <@s>."""
         self._expect(TokenType.VAR, "Expected 'var' keyword")
         
         self._expect(TokenType.NUM, "Expected 'num' keyword")
         
         name = self._expect_identifier("Expected variable name")
-        
-        scope = self._parse_scope_selector()
+        # Optional scope selector; default to <@s>
+        if self._peek().type == TokenType.LANGLE:
+            scope = self._parse_scope_selector()
+        else:
+            scope = "<@s>"
         
         self._expect(TokenType.ASSIGN, "Expected '=' after variable declaration")
         
@@ -204,10 +207,14 @@ class MDLParser:
         )
     
     def _parse_variable_assignment(self) -> VariableAssignment:
-        """Parse variable assignment: name<scope> = value;"""
+        """Parse variable assignment: name<scope?> = value; defaults to <@s>."""
         name = self._expect_identifier("Expected variable name")
         
-        scope = self._parse_scope_selector()
+        # Optional scope selector; default to <@s>
+        if self._peek().type == TokenType.LANGLE:
+            scope = self._parse_scope_selector()
+        else:
+            scope = "<@s>"
         
         self._expect(TokenType.ASSIGN, "Expected '=' after variable name")
         
@@ -423,17 +430,12 @@ class MDLParser:
         
         # Extract variables from the message content
         variables = []
-        # Simple regex-like extraction of $variable<scope>$ patterns
+        # Support both $var<scope>$ and $var$
         import re
-        var_pattern = r'\$([a-zA-Z_][a-zA-Z0-9_]*<[^>]+>)\$'
-        matches = re.findall(var_pattern, message)
-        
-        for match in matches:
-            # Parse the variable name and scope from the match
-            if '<' in match and '>' in match:
-                name = match[:match.index('<')]
-                scope = match[match.index('<'):match.index('>')+1]
-                variables.append(VariableSubstitution(name=name, scope=scope))
+        for m in re.finditer(r'\$([a-zA-Z_][a-zA-Z0-9_]*)(<[^>]+>)?\$', message):
+            name = m.group(1)
+            scope = m.group(2) if m.group(2) else "<@s>"
+            variables.append(VariableSubstitution(name=name, scope=scope))
         
         self._expect(TokenType.QUOTE, "Expected closing quote for say message")
         self._expect(TokenType.SEMICOLON, "Expected semicolon after say command")
@@ -441,23 +443,23 @@ class MDLParser:
         return SayCommand(message=message, variables=variables)
     
     def _parse_variable_substitution(self) -> VariableSubstitution:
-        """Parse variable substitution: $variable<scope>$"""
+        """Parse variable substitution: $variable<scope?>$; defaults to <@s>."""
         self._expect(TokenType.DOLLAR, "Expected '$' to start variable substitution")
         
         name = self._expect_identifier("Expected variable name")
         
-        # For variable substitutions, use LANGLE/RANGLE
-        self._expect(TokenType.LANGLE, "Expected '<' for scope selector")
-        
-        # Parse the selector content
-        selector_content = ""
-        while not self._is_at_end() and self._peek().type != TokenType.RANGLE:
-            selector_content += self._peek().value
-            self._advance()
-        
-        self._expect(TokenType.RANGLE, "Expected '>' to close scope selector")
-        
-        scope = f"<{selector_content}>"
+        # Optional scope selector; if absent, default to <@s>
+        if self._peek().type == TokenType.LANGLE:
+            # Parse the selector content
+            self._advance()  # consume '<'
+            selector_content = ""
+            while not self._is_at_end() and self._peek().type != TokenType.RANGLE:
+                selector_content += self._peek().value
+                self._advance()
+            self._expect(TokenType.RANGLE, "Expected '>' to close scope selector")
+            scope = f"<{selector_content}>"
+        else:
+            scope = "<@s>"
         
         self._expect(TokenType.DOLLAR, "Expected '$' to end variable substitution")
         

{minecraft_datapack_language-16.0.26.dist-info → minecraft_datapack_language-16.0.28.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=9Io2uGycUQspibnh92Snt8pQAmKVajJ5SJecKmgkXmc,708
+minecraft_datapack_language/_version.py,sha256=bmhcpRqKLNV6g-1OUDfz8QiS6wYJ0UpSeaB-Hc5O-uA,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=DRE6du7JRScZo8NRIGN9hF0CkDPeHspsKaYXNL8ZPRc,70187
+minecraft_datapack_language/mdl_compiler.py,sha256=Cs3fXtIAG4_Johp7h3BeYOs9RNUogkvYsR8Dvt7Ek1E,70720
 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/mdl_parser.py,sha256=1ecbkzvkgwcjfF8tn6Hxg4jBIjyFlk4bCzJ46p0-JR0,27477
 minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-16.0.26.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.26.dist-info/METADATA,sha256=ivoK-jgFfHI5hoLC1oikEy_OEHtrmDs14WuNNpLXx5c,8344
-minecraft_datapack_language-16.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.26.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.26.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.26.dist-info/RECORD,,
+minecraft_datapack_language-16.0.28.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.28.dist-info/METADATA,sha256=1EihqA4rlANyoQN2_i-XMQNtsSwNGvdsPVunVG4WA6A,8344
+minecraft_datapack_language-16.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.28.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.28.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.28.dist-info/RECORD,,