mapres 3.dev25__tar.gz → 3.dev27__tar.gz

{mapres-3.dev25/src/mapres.egg-info → mapres-3.dev27}/PKG-INFO

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

{mapres-3.dev25 → mapres-3.dev27}/pyproject.toml

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

{mapres-3.dev25 → mapres-3.dev27}/src/mapres/__init__.py

@@ -10,6 +10,7 @@ except PackageNotFoundError:
 from .resolver import MapResolver, res, setGlobalMaps
 from .datamap import DataMap, datamap, syntax
 from .layers import Layer, LayerStack
+from .utils import rprint
 
 # maps
 from .maps.color import ColorMap, ascii_colors, mc_colors, strip_colors
@@ -28,6 +29,10 @@ maps = SimpleNamespace(
     time = time,
 )
 
+utils = SimpleNamespace(
+    rprint = rprint,
+)
+
 __all__ = [
     # core modules
     'MapResolver',
@@ -39,6 +44,9 @@ __all__ = [
     'LayerStack',
     'setGlobalMaps',
 
+    # utils
+    'rprint',
+
     # maps
     'ColorMap',
     'ascii_colors',
@@ -49,4 +57,5 @@ __all__ = [
 
     # namespaces
     'maps',
+    'utils',
 ]

{mapres-3.dev25 → mapres-3.dev27}/src/mapres/resolver.py

@@ -129,7 +129,7 @@ def setGlobalMaps(maps, *, priority=0):
     _DEFAULT_RESOLVER.layers.add_layer(maps, priority=priority)
 
 def res(text: str, **ctx) -> str:
-    """
+    '''
     Simple global resolution.
-    """
+    '''
     return _DEFAULT_RESOLVER.res(text, **ctx)

{mapres-3.dev25 → mapres-3.dev27}/src/mapres/tokenizer.py

@@ -16,8 +16,9 @@ class TokenType(Enum):
     PIPE_CLOSE = auto()
     PERCENT_OPEN = auto()
     PERCENT_CLOSE = auto()
-    LPAREN = auto()
-    RPAREN = 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()
 
 
 class Token:
@@ -206,18 +207,18 @@ class Tokenizer:
                 self.advance()
                 continue
 
-            # --- parens ---
-            if ch == '(':
-                flush_text()
-                self.emit(TokenType.LPAREN)
-                self.advance()
-                continue
-
-            if ch == ')':
-                flush_text()
-                self.emit(TokenType.RPAREN)
-                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)

mapres-3.dev27/src/mapres/utils.py

@@ -0,0 +1,5 @@
+from .resolver import res
+
+def rprint(text: str, **ctx) -> None:
+    '''Simple global resolution and print'''
+    print(res(text, **ctx))

{mapres-3.dev25 → mapres-3.dev27/src/mapres.egg-info}/PKG-INFO

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

{mapres-3.dev25 → mapres-3.dev27}/src/mapres.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/mapres/layers.py
 src/mapres/parser.py
 src/mapres/resolver.py
 src/mapres/tokenizer.py
+src/mapres/utils.py
 src/mapres.egg-info/PKG-INFO
 src/mapres.egg-info/SOURCES.txt
 src/mapres.egg-info/dependency_links.txt