mapres 3.dev9__tar.gz → 3.dev11__tar.gz

{mapres-3.dev9/src/mapres.egg-info → mapres-3.dev11}/PKG-INFO

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

{mapres-3.dev9 → mapres-3.dev11}/pyproject.toml

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

{mapres-3.dev9 → mapres-3.dev11}/src/mapres/evaluator.py

@@ -11,15 +11,11 @@ class Evaluator:
         self.ctx = ctx or {}
         self._seen = set()  # cycle detection
 
-    # -----------------------------
-    # PUBLIC API
-    # -----------------------------
+    # public api
     def evaluate(self, node):
         return self._eval(node)
 
-    # -----------------------------
-    # INTERNAL DISPATCH
-    # -----------------------------
+    # internal dispatch
     def _eval(self, node):
         if isinstance(node, TemplateNode):
             return self._eval_template(node)
@@ -35,18 +31,14 @@ class Evaluator:
 
         raise EvaluationError(f"Unknown AST node: {node}")
 
-    # -----------------------------
-    # TEMPLATE
-    # -----------------------------
+    # template
     def _eval_template(self, node: TemplateNode):
         parts = []
         for child in node.children:
             parts.append(self._eval(child))
         return "".join(parts)
 
-    # -----------------------------
-    # IDENTIFIER
-    # -----------------------------
+    # identifier
     def _eval_ident(self, node: IdentNode):
         name = node.name
 
@@ -77,9 +69,7 @@ class Evaluator:
         self._seen.remove(name)
         raise EvaluationError(f"Missing key '{name}'")
 
-    # -----------------------------
-    # CALL (nested token)
-    # -----------------------------
+    # call (nested token)
     def _eval_call(self, node: CallNode):
         outer = node.name
 
@@ -110,9 +100,7 @@ class Evaluator:
         self._seen.remove(outer)
         raise EvaluationError(f"Missing nested key '{outer}({arg_value})'")
 
-    # -----------------------------
-    # HELPERS
-    # -----------------------------
+    # helpers
     def _map_to_dict(self, m):
         if hasattr(m, "as_map"):
             return m.as_map()

{mapres-3.dev9 → mapres-3.dev11}/src/mapres/tokenizer.py

@@ -50,6 +50,7 @@ class Tokenizer:
         self.in_pipe = False
         self.in_percent = False
         self.in_colon = False
+        self.escaped = False
 
     def peek(self, k=0):
         idx = self.i + k
@@ -79,27 +80,32 @@ class Tokenizer:
 
             # ESCAPES
             if self.match(r'\:'):
-                buf.append(':'); self.advance(2); continue
+                buf.append(':'); self.advance(2); self.escaped = True; continue
             if self.match(r'\<'):
-                buf.append('<'); self.advance(2); continue
+                buf.append('<'); self.advance(2); self.escaped = True; continue
             if self.match(r'\>'):
-                buf.append('>'); self.advance(2); continue
+                buf.append('>'); self.advance(2); self.escaped = True; continue
             if self.match(r'\%'):
-                buf.append('%'); self.advance(2); continue
+                buf.append('%'); self.advance(2); self.escaped = True; continue
             if self.match(r'\$'):
-                buf.append('$'); self.advance(2); continue
+                buf.append('$'); self.advance(2); self.escaped = True; continue
             if self.match(r'\{'):
-                buf.append('{'); self.advance(2); continue
+                buf.append('{'); self.advance(2); self.escaped = True; continue
             if self.match(r'\}'):
-                buf.append('}'); self.advance(2); continue
+                buf.append('}'); self.advance(2); self.escaped = True; continue
             if self.match(r'\|'):
-                buf.append('|'); self.advance(2); continue
+                buf.append('|'); self.advance(2); self.escaped = True; continue
             if self.match(r'\('):
-                buf.append('('); self.advance(2); continue
+                buf.append('('); self.advance(2); self.escaped = True; continue
             if self.match(r'\)'):
-                buf.append(')'); self.advance(2); continue
+                buf.append(')'); self.advance(2); self.escaped = True; continue
+
+            if self.escaped:
+                buf.append(ch)
+                self.escaped = False
+                self.advance()
+                continue
 
-            # DOUBLE BRACES {{value}}
             if self.match("{{"):
                 flush_text()
                 self.emit(TokenType.BRACE_OPEN)
@@ -112,7 +118,6 @@ class Tokenizer:
                 self.advance(2)
                 continue
 
-            # DOLLARS ${value}
             if self.match("${"):
                 flush_text()
                 self.emit(TokenType.DOLLAR_OPEN)
@@ -125,7 +130,6 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # ANGLES <value>
             if self.match("<"):
                 flush_text()
                 self.emit(TokenType.ANGLE_OPEN)
@@ -138,7 +142,6 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # PIPES |value|
             if self.match("|"):
                 flush_text()
                 if not self.in_pipe:
@@ -150,7 +153,6 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # PERCENTS %value%
             if self.match("%"):
                 flush_text()
                 if not self.in_percent:
@@ -162,7 +164,6 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # COLONS :value:
             if self.match(":"):
                 flush_text()
                 if not self.in_colon:
@@ -174,7 +175,6 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # PARENTHESES
             if ch == "(":
                 flush_text()
                 self.emit(TokenType.LPAREN)
@@ -187,7 +187,6 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # IDENTIFIERS (with dots)
             if ch.isalpha():
                 flush_text()
                 start = self.i
@@ -197,7 +196,6 @@ class Tokenizer:
                 self.emit(TokenType.IDENT, ident)
                 continue
 
-            # DEFAULT: TEXT
             buf.append(ch)
             self.advance()
 

{mapres-3.dev9 → mapres-3.dev11/src/mapres.egg-info}/PKG-INFO

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