mapres 3.dev21__py3-none-any.whl → 3.dev22__py3-none-any.whl

mapres/parser.py

@@ -22,11 +22,10 @@ class Parser:
     def expect(self, type_: TokenType) -> Token:
         tok = self.peek()
         if tok is None or tok.type != type_:
-            raise ParserError(f"Expected {type_}, got {tok}")
+            raise ParserError(f'Expected {type_}, got {tok}')
         self.advance()
         return tok
 
-    # top-level template parse
     def parse(self) -> TemplateNode:
         children: list[Node] = []
         while self.peek() is not None:
@@ -38,88 +37,76 @@ class Parser:
                 children.append(self.parse_token())
         return TemplateNode(children)
 
-    # nested template parse (for IDENT(...))
     def parse_until(self, stop_types: tuple[TokenType, ...]) -> TemplateNode:
         children: list[Node] = []
         while True:
             tok = self.peek()
             if tok is None or tok.type in stop_types:
                 break
-
             if tok.type is TokenType.TEXT:
                 children.append(TextNode(tok.value))
                 self.advance()
             else:
                 children.append(self.parse_token())
-
         return TemplateNode(children)
 
-    # dispatch by opening delimiter
     def parse_token(self) -> Node:
         tok = self.peek()
 
         if tok.type is TokenType.COLON_OPEN:
-            return self.parse_colon_token()
+            return self.parse_colon()
 
         if tok.type is TokenType.BRACE_OPEN:
-            return self.parse_brace_token()
+            return self.parse_brace()
 
         if tok.type is TokenType.DOLLAR_OPEN:
-            return self.parse_dollar_token()
+            return self.parse_dollar()
 
         if tok.type is TokenType.ANGLE_OPEN:
-            return self.parse_angle_token()
+            return self.parse_angle()
 
         if tok.type is TokenType.PIPE_OPEN:
-            return self.parse_pipe_token()
+            return self.parse_pipe()
 
         if tok.type is TokenType.PERCENT_OPEN:
-            return self.parse_percent_token()
+            return self.parse_percent()
 
-        raise ParserError(f"Unexpected token {tok}")
+        raise ParserError(f'Unexpected token {tok}')
 
-    # core pattern: IDENT or IDENT(arg)
     def _parse_ident_or_call(self, closing_type: TokenType, syntax_name: str) -> Node:
         ident_tok = self.expect(TokenType.IDENT)
         name = ident_tok.value
 
-        # IDENT(arg)
         if self.peek() and self.peek().type is TokenType.LPAREN:
-            self.advance()  # consume '('
-
-            # parse only until RPAREN
+            self.advance()
             arg = self.parse_until((TokenType.RPAREN,))
-
             self.expect(TokenType.RPAREN)
             self.expect(closing_type)
             return CallNode(name=name, arg=arg, syntax=syntax_name)
 
-        # IDENT
         self.expect(closing_type)
         return IdentNode(name=name, syntax=syntax_name)
 
-    # --- syntax-bound token handlers ---
-
-    def parse_colon_token(self) -> Node:
+    def parse_colon(self) -> Node:
         self.expect(TokenType.COLON_OPEN)
-        return self._parse_ident_or_call(TokenType.COLON_CLOSE, "colons")
+        return self._parse_ident_or_call(TokenType.COLON_CLOSE, 'colons')
 
-    def parse_brace_token(self) -> Node:
+    def parse_brace(self) -> Node:
         self.expect(TokenType.BRACE_OPEN)
-        return self._parse_ident_or_call(TokenType.BRACE_CLOSE, "braces")
+        return self._parse_ident_or_call(TokenType.BRACE_CLOSE, 'braces')
 
-    def parse_dollar_token(self) -> Node:
+    def parse_dollar(self) -> Node:
         self.expect(TokenType.DOLLAR_OPEN)
-        return self._parse_ident_or_call(TokenType.DOLLAR_CLOSE, "dollars")
+        return self._parse_ident_or_call(TokenType.DOLLAR_CLOSE, 'dollars')
 
-    def parse_angle_token(self) -> Node:
+    def parse_angle(self) -> Node:
         self.expect(TokenType.ANGLE_OPEN)
-        return self._parse_ident_or_call(TokenType.ANGLE_CLOSE, "angles")
+        return self._parse_ident_or_call(TokenType.ANGLE_CLOSE, 'angles')
 
-    def parse_pipe_token(self) -> Node:
+    def parse_pipe(self) -> Node:
         self.expect(TokenType.PIPE_OPEN)
-        return self._parse_ident_or_call(TokenType.PIPE_CLOSE, "pipes")
+        return self._parse_ident_or_call(TokenType.PIPE_CLOSE, 'pipes')
 
-    def parse_percent_token(self) -> Node:
+    def parse_percent(self) -> Node:
         self.expect(TokenType.PERCENT_OPEN)
-        return self._parse_ident_or_call(TokenType.PERCENT_CLOSE, "percents")
+        return self._parse_ident_or_call(TokenType.PERCENT_CLOSE, 'percents')

mapres/tokenizer.py

@@ -33,37 +33,29 @@ class Token:
 
 
 class Tokenizer:
-    def __init__(self, text):
+    def __init__(self, text: str):
         self.text = text
         self.i = 0
         self.n = len(text)
-        self.tokens = []
+        self.tokens: list[Token] = []
 
-        # toggle states
-        self.in_pipe = False
-        self.in_percent = False
-        self.in_colon = False
-
-        # mixed states
-        self.in_dollar = False
-
-    def peek(self, k=0):
+    def peek(self, k: int = 0) -> str:
         idx = self.i + k
         if idx >= self.n:
             return ''
         return self.text[idx]
 
-    def advance(self, k=1):
+    def advance(self, k: int = 1) -> None:
         self.i += k
 
-    def match(self, s):
+    def match(self, s: str) -> bool:
         return self.text.startswith(s, self.i)
 
-    def emit(self, type_, value=None):
+    def emit(self, type_, value=None) -> None:
         self.tokens.append(Token(type_, value, self.i))
 
-    def tokenize(self):
-        buf = []
+    def tokenize(self) -> list[Token]:
+        buf: list[str] = []
 
         def flush_text():
             if buf:
@@ -95,93 +87,109 @@ class Tokenizer:
             if self.match(r'\)'):
                 buf.append(')'); self.advance(2); continue
 
-            # --- paired delimiters ---
-
-            # braces {{ }}
+            # --- {{IDENT}} ---
             if self.match('{{'):
                 flush_text()
-                self.emit(TokenType.BRACE_OPEN)
-                self.advance(2)
-                continue
-
-            if self.match('}}'):
-                flush_text()
-                self.emit(TokenType.BRACE_CLOSE)
+                start = self.i
                 self.advance(2)
-                continue
-
-            # angles < >
-            if self.match('<'):
-                flush_text()
-                self.emit(TokenType.ANGLE_OPEN)
-                self.advance()
-                continue
-
-            if self.match('>'):
-                flush_text()
-                self.emit(TokenType.ANGLE_CLOSE)
+                ident = self._read_ident()
+                if ident is not None and self.match('}}'):
+                    self.emit(TokenType.BRACE_OPEN)
+                    self.emit(TokenType.IDENT, ident)
+                    self.advance(2)
+                    self.emit(TokenType.BRACE_CLOSE)
+                    continue
+                self.i = start
+                buf.append(self.peek())
                 self.advance()
                 continue
 
-            # --- mixed delimiters (dollars) ---
-
+            # --- ${IDENT} ---
             if self.match('${'):
                 flush_text()
-                self.emit(TokenType.DOLLAR_OPEN)
-                self.in_dollar = True
+                start = self.i
                 self.advance(2)
+                ident = self._read_ident()
+                if ident is not None and self.peek() == '}':
+                    self.emit(TokenType.DOLLAR_OPEN)
+                    self.emit(TokenType.IDENT, ident)
+                    self.advance()
+                    self.emit(TokenType.DOLLAR_CLOSE)
+                    continue
+                self.i = start
+                buf.append(self.peek())
+                self.advance()
                 continue
 
-            if ch == '}':
+            # --- <IDENT> ---
+            if ch == '<':
                 flush_text()
-                if self.in_dollar:
-                    self.emit(TokenType.DOLLAR_CLOSE)
-                    self.in_dollar = False
-                else:
-                    buf.append('}')
+                start = self.i
+                self.advance()
+                ident = self._read_ident()
+                if ident is not None and self.peek() == '>':
+                    self.emit(TokenType.ANGLE_OPEN)
+                    self.emit(TokenType.IDENT, ident)
+                    self.advance()
+                    self.emit(TokenType.ANGLE_CLOSE)
+                    continue
+                self.i = start
+                buf.append(self.peek())
                 self.advance()
                 continue
 
-            # --- toggle delimiters ---
-
-            # pipes |...|
-            if self.match('|'):
+            # --- |IDENT| ---
+            if ch == '|':
                 flush_text()
-                if not self.in_pipe:
+                start = self.i
+                self.advance()
+                ident = self._read_ident()
+                if ident is not None and self.peek() == '|':
                     self.emit(TokenType.PIPE_OPEN)
-                    self.in_pipe = True
-                else:
+                    self.emit(TokenType.IDENT, ident)
+                    self.advance()
                     self.emit(TokenType.PIPE_CLOSE)
-                    self.in_pipe = False
+                    continue
+                self.i = start
+                buf.append(self.peek())
                 self.advance()
                 continue
 
-            # percents %...%
-            if self.match('%'):
+            # --- %IDENT% ---
+            if ch == '%':
                 flush_text()
-                if not self.in_percent:
+                start = self.i
+                self.advance()
+                ident = self._read_ident()
+                if ident is not None and self.peek() == '%':
                     self.emit(TokenType.PERCENT_OPEN)
-                    self.in_percent = True
-                else:
+                    self.emit(TokenType.IDENT, ident)
+                    self.advance()
                     self.emit(TokenType.PERCENT_CLOSE)
-                    self.in_percent = False
+                    continue
+                self.i = start
+                buf.append(self.peek())
                 self.advance()
                 continue
 
-            # colons :...:
-            if self.match(':'):
+            # --- :IDENT: ---
+            if ch == ':':
                 flush_text()
-                if not self.in_colon:
+                start = self.i
+                self.advance()
+                ident = self._read_ident()
+                if ident is not None and self.peek() == ':':
                     self.emit(TokenType.COLON_OPEN)
-                    self.in_colon = True
-                else:
+                    self.emit(TokenType.IDENT, ident)
+                    self.advance()
                     self.emit(TokenType.COLON_CLOSE)
-                    self.in_colon = False
+                    continue
+                self.i = start
+                buf.append(self.peek())
                 self.advance()
                 continue
 
             # --- parens ---
-
             if ch == '(':
                 flush_text()
                 self.emit(TokenType.LPAREN)
@@ -194,39 +202,30 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # --- IDENT (your rules) ---
-
-            if ch.isalnum():
-                flush_text()
-                start = self.i
-
-                # first char: [a-zA-Z0-9]
-                self.advance()
-
-                # middle chars: [a-zA-Z0-9._]*
-                while True:
-                    nxt = self.peek()
-                    if not nxt:
-                        break
-                    if nxt.isalnum() or nxt in '._':
-                        self.advance()
-                    else:
-                        break
-
-                ident = self.text[start:self.i]
-
-                # enforce: no leading/trailing '_', no '-'
-                if ident.startswith('_') or ident.endswith('_') or '-' in ident:
-                    # treat as TEXT instead
-                    buf.append(ident)
-                else:
-                    self.emit(TokenType.IDENT, ident)
-                continue
-
-            # --- fallback: TEXT ---
-
+            # fallback TEXT
             buf.append(ch)
             self.advance()
 
         flush_text()
         return self.tokens
+
+    def _read_ident(self) -> str | None:
+        start = self.i
+        ch = self.peek()
+        if not ch or not ch.isalnum():
+            return None
+
+        self.advance()
+        while True:
+            nxt = self.peek()
+            if not nxt:
+                break
+            if nxt.isalnum() or nxt in '._':
+                self.advance()
+            else:
+                break
+
+        ident = self.text[start:self.i]
+        if ident.startswith('_') or ident.endswith('_') or '-' in ident:
+            return None
+        return ident

{mapres-3.dev21.dist-info → mapres-3.dev22.dist-info}/METADATA

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

{mapres-3.dev21.dist-info → mapres-3.dev22.dist-info}/RECORD

@@ -5,14 +5,14 @@ mapres/datamap.py,sha256=R_5G_mE2OZpZ9YVL4tsNXAGS_SkQ6LKlx6Bz2Pr652Y,5021
 mapres/evaluator.py,sha256=KNZ9aygOClM0kgnOf3anigsupLF175EJ07z_17ubZzU,3441
 mapres/exceptions.py,sha256=D2XKnrMkZDyUXQt2PmaKbj08FObWU00yXKGHwNpjvww,222
 mapres/layers.py,sha256=sFc1eUOBg2BoB2cBXIleq8RMYcg5GZpUoCnGh-uKN6U,1380
-mapres/parser.py,sha256=8XLCzYosvh81bN-Jddc1AM4w0X7bsHnBzmA8sq5_72w,4018
+mapres/parser.py,sha256=q3PgyvXJn9c-EJJYyibw7sHJ0Y9soirgB10OyTKaT9s,3657
 mapres/resolver.py,sha256=kQexTdBnPy70Azh_U6--hwUtnIJjoKcuaJ2KlBaG3Rg,3889
-mapres/tokenizer.py,sha256=js0S1s8MkltdQoH5V1cLjdY0fFqZoGqmtP_OhEJEM6M,6539
+mapres/tokenizer.py,sha256=0iBJBiqY4-_7jKUpY38HzLoZ2m_l2WJJvhBqcRUwo50,7182
 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.dev21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-mapres-3.dev21.dist-info/METADATA,sha256=SrQXRywgQfa_pKRb7Egsdagr1pNwn2F9S3bBdpTWdVQ,1476
-mapres-3.dev21.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-mapres-3.dev21.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
-mapres-3.dev21.dist-info/RECORD,,
+mapres-3.dev22.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+mapres-3.dev22.dist-info/METADATA,sha256=3gas02EXpAh_Gh52KVRfuhJQ0IKhUQLiwYRGYd-IbFo,1476
+mapres-3.dev22.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+mapres-3.dev22.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
+mapres-3.dev22.dist-info/RECORD,,