mapres 3.dev11__tar.gz → 3.dev13__tar.gz

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

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

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

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

{mapres-3.dev11 → mapres-3.dev13}/src/mapres/datamap.py

@@ -78,7 +78,7 @@ def datamap(_cls=None, *, syntax=None, mode=None):
         cls = type(cls.__name__, (DataMap,), namespace)
         if rules_obj is not None:
             setattr(cls, 'rules', rules_obj)
-        return dataclass(frozen=False)(cls)
+        return dataclass(frozen=False)(cls)()
     if _cls is not None:
         return wrap(_cls)
     return wrap

{mapres-3.dev11 → mapres-3.dev13}/src/mapres/resolver.py

@@ -104,6 +104,8 @@ def setGlobalMaps(maps, *, priority=0):
     Register a global map or datamap instance/class/dict.
     Lower priority = earlier lookup.
     """
+    if isinstance(maps, type):
+        maps = maps()
     _DEFAULT_RESOLVER.layers.add_layer(maps, priority=priority)
 
 def res(text: str, **ctx) -> str:

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

@@ -4,25 +4,18 @@ from enum import Enum, auto
 class TokenType(Enum):
     TEXT = auto()
     IDENT = auto()
-
     COLON_OPEN = auto()
     COLON_CLOSE = auto()
-
     BRACE_OPEN = auto()
     BRACE_CLOSE = auto()
-
     DOLLAR_OPEN = auto()
     DOLLAR_CLOSE = auto()
-
     ANGLE_OPEN = auto()
     ANGLE_CLOSE = auto()
-
     PIPE_OPEN = auto()
     PIPE_CLOSE = auto()
-
     PERCENT_OPEN = auto()
     PERCENT_CLOSE = auto()
-
     LPAREN = auto()
     RPAREN = auto()
 
@@ -45,12 +38,9 @@ class Tokenizer:
         self.i = 0
         self.n = len(text)
         self.tokens = []
-
-        # state for single-char paired delimiters
         self.in_pipe = False
         self.in_percent = False
         self.in_colon = False
-        self.escaped = False
 
     def peek(self, k=0):
         idx = self.i + k
@@ -78,33 +68,26 @@ class Tokenizer:
         while self.i < self.n:
             ch = self.peek()
 
-            # ESCAPES
             if self.match(r'\:'):
-                buf.append(':'); self.advance(2); self.escaped = True; continue
+                buf.append(':'); self.advance(2); continue
             if self.match(r'\<'):
-                buf.append('<'); self.advance(2); self.escaped = True; continue
+                buf.append('<'); self.advance(2); continue
             if self.match(r'\>'):
-                buf.append('>'); self.advance(2); self.escaped = True; continue
+                buf.append('>'); self.advance(2); continue
             if self.match(r'\%'):
-                buf.append('%'); self.advance(2); self.escaped = True; continue
+                buf.append('%'); self.advance(2); continue
             if self.match(r'\$'):
-                buf.append('$'); self.advance(2); self.escaped = True; continue
+                buf.append('$'); self.advance(2); continue
             if self.match(r'\{'):
-                buf.append('{'); self.advance(2); self.escaped = True; continue
+                buf.append('{'); self.advance(2); continue
             if self.match(r'\}'):
-                buf.append('}'); self.advance(2); self.escaped = True; continue
+                buf.append('}'); self.advance(2); continue
             if self.match(r'\|'):
-                buf.append('|'); self.advance(2); self.escaped = True; continue
+                buf.append('|'); self.advance(2); continue
             if self.match(r'\('):
-                buf.append('('); self.advance(2); self.escaped = True; continue
+                buf.append('('); self.advance(2); continue
             if self.match(r'\)'):
-                buf.append(')'); self.advance(2); self.escaped = True; continue
-
-            if self.escaped:
-                buf.append(ch)
-                self.escaped = False
-                self.advance()
-                continue
+                buf.append(')'); self.advance(2); continue
 
             if self.match("{{"):
                 flush_text()

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

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