mapres 3.dev27__py3-none-any.whl → 3.dev28__py3-none-any.whl

mapres/tokenizer.py

@@ -16,9 +16,8 @@ class TokenType(Enum):
     PIPE_CLOSE = auto()
     PERCENT_OPEN = auto()
     PERCENT_CLOSE = auto()
-    # # LPAREN and RPAREN tokens were deprecated in mapres 3-dev.27 to fix a bug in the parser that caused it to fail on nested calls
-    # LPAREN = auto()
-    # RPAREN = auto()
+    LPAREN = auto()
+    RPAREN = auto()
 
 
 class Token:
@@ -94,6 +93,18 @@ class Tokenizer:
                 start = self.i
                 self.advance(2)
                 ident = self._read_ident()
+                # ident == None means _read_ident already emitted IDENT and nested tokens
+                if ident is None:
+                    # nested call already emitted; expect closing '}}'
+                    if self.match('}}'):
+                        self.advance(2)
+                        self.emit(TokenType.BRACE_CLOSE)
+                        continue
+                    # fallback to literal
+                    self.i = start
+                    buf.append(self.peek())
+                    self.advance()
+                    continue
                 if ident is not None and self.match('}}'):
                     self.emit(TokenType.BRACE_OPEN)
                     self.emit(TokenType.IDENT, ident)
@@ -111,6 +122,16 @@ class Tokenizer:
                 start = self.i
                 self.advance(2)
                 ident = self._read_ident()
+                if ident is None:
+                    # nested call already emitted; expect closing '}'
+                    if self.peek() == '}':
+                        self.advance()
+                        self.emit(TokenType.DOLLAR_CLOSE)
+                        continue
+                    self.i = start
+                    buf.append(self.peek())
+                    self.advance()
+                    continue
                 if ident is not None and self.peek() == '}':
                     self.emit(TokenType.DOLLAR_OPEN)
                     self.emit(TokenType.IDENT, ident)
@@ -145,6 +166,16 @@ class Tokenizer:
                 start = self.i
                 self.advance()
                 ident = self._read_ident()
+                if ident is None:
+                    # nested call already emitted; expect closing '>'
+                    if self.peek() == '>':
+                        self.advance()
+                        self.emit(TokenType.ANGLE_CLOSE)
+                        continue
+                    self.i = start
+                    buf.append(self.peek())
+                    self.advance()
+                    continue
                 if ident is not None and self.peek() == '>':
                     self.emit(TokenType.ANGLE_OPEN)
                     self.emit(TokenType.IDENT, ident)
@@ -162,6 +193,16 @@ class Tokenizer:
                 start = self.i
                 self.advance()
                 ident = self._read_ident()
+                if ident is None:
+                    # nested call already emitted; expect closing '|'
+                    if self.peek() == '|':
+                        self.advance()
+                        self.emit(TokenType.PIPE_CLOSE)
+                        continue
+                    self.i = start
+                    buf.append(self.peek())
+                    self.advance()
+                    continue
                 if ident is not None and self.peek() == '|':
                     self.emit(TokenType.PIPE_OPEN)
                     self.emit(TokenType.IDENT, ident)
@@ -179,6 +220,16 @@ class Tokenizer:
                 start = self.i
                 self.advance()
                 ident = self._read_ident()
+                if ident is None:
+                    # nested call already emitted; expect closing '%'
+                    if self.peek() == '%':
+                        self.advance()
+                        self.emit(TokenType.PERCENT_CLOSE)
+                        continue
+                    self.i = start
+                    buf.append(self.peek())
+                    self.advance()
+                    continue
                 if ident is not None and self.peek() == '%':
                     self.emit(TokenType.PERCENT_OPEN)
                     self.emit(TokenType.IDENT, ident)
@@ -196,6 +247,16 @@ class Tokenizer:
                 start = self.i
                 self.advance()
                 ident = self._read_ident()
+                if ident is None:
+                    # nested call already emitted; expect closing ':'
+                    if self.peek() == ':':
+                        self.advance()
+                        self.emit(TokenType.COLON_CLOSE)
+                        continue
+                    self.i = start
+                    buf.append(self.peek())
+                    self.advance()
+                    continue
                 if ident is not None and self.peek() == ':':
                     self.emit(TokenType.COLON_OPEN)
                     self.emit(TokenType.IDENT, ident)
@@ -207,19 +268,6 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # # --- parens --- (This block was deprecated in mapres 3-dev.27)
-            # if ch == '(':
-            #     flush_text()
-            #     self.emit(TokenType.LPAREN)
-            #     self.advance()
-            #     continue
-
-            # if ch == ')':
-            #     flush_text()
-            #     self.emit(TokenType.RPAREN)
-            #     self.advance()
-            #     continue
-
             # fallback TEXT
             buf.append(ch)
             self.advance()
@@ -246,4 +294,32 @@ class Tokenizer:
         ident = self.text[start:self.i]
         if ident.startswith('_') or ident.endswith('_') or '-' in ident:
             return None
+
+        # unified nested-call support: if '(' immediately follows the ident,
+        # emit IDENT + LPAREN + nested TEXT + RPAREN and return None.
+        if self.peek() == '(':
+            # emit IDENT token
+            self.emit(TokenType.IDENT, ident)
+
+            # consume '(' and emit LPAREN
+            self.advance()
+            self.emit(TokenType.LPAREN)
+
+            # capture nested content as TEXT until the next ')'
+            nested_start = self.i
+            while self.peek() not in (')', ''):
+                self.advance()
+            nested_text = self.text[nested_start:self.i]
+            if nested_text:
+                self.emit(TokenType.TEXT, nested_text)
+
+            # consume ')' and emit RPAREN if present
+            if self.peek() == ')':
+                self.advance()
+                self.emit(TokenType.RPAREN)
+
+            # signal to caller that tokens were emitted already
+            return None
+
+        # no nested call; return the identifier string
         return ident

{mapres-3.dev27.dist-info → mapres-3.dev28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 3.dev27
+Version: 3.dev28
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT

{mapres-3.dev27.dist-info → mapres-3.dev28.dist-info}/RECORD

@@ -7,13 +7,13 @@ mapres/exceptions.py,sha256=D2XKnrMkZDyUXQt2PmaKbj08FObWU00yXKGHwNpjvww,222
 mapres/layers.py,sha256=sFc1eUOBg2BoB2cBXIleq8RMYcg5GZpUoCnGh-uKN6U,1380
 mapres/parser.py,sha256=q3PgyvXJn9c-EJJYyibw7sHJ0Y9soirgB10OyTKaT9s,3657
 mapres/resolver.py,sha256=ldSNSUg-yvk2LJnpyGpexYvPiVACFa4IMGHOFejGY_0,3889
-mapres/tokenizer.py,sha256=HXZBIlTbPA7T-w4kGHTLdHwuPokmXA5TQTrr2PzNeLA,8002
+mapres/tokenizer.py,sha256=FLrO4pNKEmsFTUXXOUQ-GLIozzs18hbMRmWV_ccwt7M,11095
 mapres/utils.py,sha256=Bv8iEeK03QtGtqY9GnBAgE4Bul56mGvAkLt96z6kU2k,137
 mapres/maps/__init__.py,sha256=lIRRfem1Fw4iynuwUQ7BY5qrC4fbJKxqLivao2_Dtm4,239
 mapres/maps/color.py,sha256=noRTGFNo9xLl5YEhX0tttV6i_oDAiptXmRVnkr5EzwM,1348
 mapres/maps/time.py,sha256=TyncycYoIGVZWps32qWlFy2a2hTayvZWVHu9uh2nid8,2050
-mapres-3.dev27.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-mapres-3.dev27.dist-info/METADATA,sha256=00k_RRbyvuSG2qfbrJERAQ-48ZvcQBBbfyuMUHXhZ3Q,1476
-mapres-3.dev27.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-mapres-3.dev27.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
-mapres-3.dev27.dist-info/RECORD,,
+mapres-3.dev28.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+mapres-3.dev28.dist-info/METADATA,sha256=7qyVrSLnMSxSGJiTU5HCcvdNpa7DOy3iCLTcPohv8Kk,1476
+mapres-3.dev28.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+mapres-3.dev28.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
+mapres-3.dev28.dist-info/RECORD,,