mapres 3.dev10__py3-none-any.whl → 3.dev11__py3-none-any.whl

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

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

{mapres-3.dev10.dist-info → mapres-3.dev11.dist-info}/RECORD

@@ -7,12 +7,12 @@ mapres/exceptions.py,sha256=jirHKK5yCffSCWWkgZY_gTSIOaFCmXOe5NJJf60HeeQ,130
 mapres/layers.py,sha256=sFc1eUOBg2BoB2cBXIleq8RMYcg5GZpUoCnGh-uKN6U,1380
 mapres/parser.py,sha256=8XLCzYosvh81bN-Jddc1AM4w0X7bsHnBzmA8sq5_72w,4018
 mapres/resolver.py,sha256=LOAnuNc1RW97eBXughkEPK90MntMSYa7yC8s1EJPVvA,3134
-mapres/tokenizer.py,sha256=zw1jhnfypak1bLSTlyo9Xj4UoOF9DJ3y1qqu2OzudiI,5702
+mapres/tokenizer.py,sha256=zVztowsVTMJzb0my4p3ba-J4wh1Tyt1gdHIIscxfm6Q,5817
 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.dev10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-mapres-3.dev10.dist-info/METADATA,sha256=JEbQIvISO6tzTT-q8T_4vqZ3fbfhjATadPmbiq2LdM0,1476
-mapres-3.dev10.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-mapres-3.dev10.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
-mapres-3.dev10.dist-info/RECORD,,
+mapres-3.dev11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+mapres-3.dev11.dist-info/METADATA,sha256=7XVIAYdOAvC8pPOj-vUb67hNpMa_pV2aDUq7Jzxyw-M,1476
+mapres-3.dev11.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+mapres-3.dev11.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
+mapres-3.dev11.dist-info/RECORD,,