mapres 3.dev25__py3-none-any.whl → 3.dev27__py3-none-any.whl

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/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/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/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.dist-info → mapres-3.dev27.dist-info}/METADATA

@@ -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.dist-info → mapres-3.dev27.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mapres/__init__.py,sha256=t23ofM-wzpPByYi1rEQonxyU1yyza4ZzwwHDZUa5QqA,1010
+mapres/__init__.py,sha256=UuB43pqTwpqW1bdui9C6E7KmFBS1bSf9Xja6zaf6GT0,1125
 mapres/ast.py,sha256=6PcMkwtNHYD8xEkdyzDgn_mRTj1ZaWSyuHZK3BtXiuo,427
 mapres/cache.py,sha256=hbvsoc6Qw3RhWAEfOOpKHtC7i9EomoUgWzyd4dnH71w,333
 mapres/datamap.py,sha256=oWeNqBJGVF4wO5f3RqGoXV4nwQSQrDQ5LnCYoAXEfoY,5446
@@ -6,13 +6,14 @@ mapres/evaluator.py,sha256=MV5nyQJ0R40RX4CdXj-lXXKT6dEG_ocoGClM6kLs38U,4756
 mapres/exceptions.py,sha256=D2XKnrMkZDyUXQt2PmaKbj08FObWU00yXKGHwNpjvww,222
 mapres/layers.py,sha256=sFc1eUOBg2BoB2cBXIleq8RMYcg5GZpUoCnGh-uKN6U,1380
 mapres/parser.py,sha256=q3PgyvXJn9c-EJJYyibw7sHJ0Y9soirgB10OyTKaT9s,3657
-mapres/resolver.py,sha256=kQexTdBnPy70Azh_U6--hwUtnIJjoKcuaJ2KlBaG3Rg,3889
-mapres/tokenizer.py,sha256=O28ZTClzC8CkHlnjMHlyGsSLXwMRKIho-JZLF-JDxj0,7795
+mapres/resolver.py,sha256=ldSNSUg-yvk2LJnpyGpexYvPiVACFa4IMGHOFejGY_0,3889
+mapres/tokenizer.py,sha256=HXZBIlTbPA7T-w4kGHTLdHwuPokmXA5TQTrr2PzNeLA,8002
+mapres/utils.py,sha256=Bv8iEeK03QtGtqY9GnBAgE4Bul56mGvAkLt96z6kU2k,137
 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.dev25.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-mapres-3.dev25.dist-info/METADATA,sha256=7PdwIxiUTr378ceVkL_dxVhLrmj3XS-jGCJLGdOzYWw,1476
-mapres-3.dev25.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-mapres-3.dev25.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
-mapres-3.dev25.dist-info/RECORD,,
+mapres-3.dev27.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+mapres-3.dev27.dist-info/METADATA,sha256=00k_RRbyvuSG2qfbrJERAQ-48ZvcQBBbfyuMUHXhZ3Q,1476
+mapres-3.dev27.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+mapres-3.dev27.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
+mapres-3.dev27.dist-info/RECORD,,