mapres 3.dev7__tar.gz → 3.dev8__tar.gz

{mapres-3.dev7/src/mapres.egg-info → mapres-3.dev8}/PKG-INFO

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

{mapres-3.dev7 → mapres-3.dev8}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapres"
-version = "3-dev.7"
+version = "3-dev.8"
 description = "A powerfull mapping utility"
 readme = "README.md"
 requires-python = ">=3.9"

{mapres-3.dev7 → mapres-3.dev8}/src/mapres/parser.py

@@ -12,22 +12,23 @@ class Parser:
         self.i = 0
         self.n = len(tokens)
 
-    def peek(self, k=0) -> Token | None:
+    def peek(self, k: int = 0) -> Token | None:
         idx = self.i + k
         return self.tokens[idx] if idx < self.n else None
 
-    def advance(self, k=1):
+    def advance(self, k: int = 1) -> None:
         self.i += k
 
-    def expect(self, type_: TokenType):
+    def expect(self, type_: TokenType) -> Token:
         tok = self.peek()
         if tok is None or tok.type != type_:
             raise ParserError(f"Expected {type_}, got {tok}")
         self.advance()
         return tok
 
+    # top-level template parse
     def parse(self) -> TemplateNode:
-        children = []
+        children: list[Node] = []
         while self.peek() is not None:
             tok = self.peek()
             if tok.type is TokenType.TEXT:
@@ -37,6 +38,23 @@ 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()
 
@@ -60,21 +78,23 @@ class Parser:
 
         raise ParserError(f"Unexpected token {tok}")
 
-    # --- core pattern: IDENT or IDENT(arg) ---
-
-    def _parse_ident_or_call(self, closing_type, syntax_name: str) -> Node:
+    # 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
 
-        # single-argument nested form: IDENT LPAREN Template RPAREN
+        # IDENT(arg)
         if self.peek() and self.peek().type is TokenType.LPAREN:
             self.advance()  # consume '('
-            arg = self.parse()  # nested Template
+
+            # parse only until RPAREN
+            arg = self.parse_until((TokenType.RPAREN,))
+
             self.expect(TokenType.RPAREN)
             self.expect(closing_type)
             return CallNode(name=name, arg=arg, syntax=syntax_name)
 
-        # simple identifier: IDENT
+        # IDENT
         self.expect(closing_type)
         return IdentNode(name=name, syntax=syntax_name)
 

{mapres-3.dev7 → mapres-3.dev8/src/mapres.egg-info}/PKG-INFO

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