omlish 0.0.0.dev445__py3-none-any.whl → 0.0.0.dev446__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev445'
-__revision__ = '68ca679313e2d1b22ba7545fe7f27bb938535ac3'
+__version__ = '0.0.0.dev446'
+__revision__ = 'eb6b4d97a54d35bfe1b12d84ba99cae32c516e4e'
 
 
 #

omlish/formats/json/stream/lexing.py

@@ -3,7 +3,6 @@ TODO:
  - max buf size
  - max recursion depth
  - mark start pos of tokens, currently returning end
- - _do_string inner loop optimization somehow
 """
 import dataclasses as dc
 import io
@@ -343,33 +342,56 @@ class JsonStreamLexer(GenMachine[str, Token]):
         while True:
             c: str | None = None
 
-            if char_in_str is not None:
-                if char_in_str_pos < char_in_str_len:
-                    # FIXME: handle str chunks separately
-                    # if (qp := char_in_str.find(q)) >= 0 and (not qp or (char_in_str[qp - 1] != '\\')):
-                    #     ofs += qp + 1
-                    #     line += char_in_str.count('\n', end=)
-                    #     if (np := char_in_str.rfind('\n')) >= 0
+            while True:
+                if char_in_str is not None:
+                    if char_in_str_pos >= char_in_str_len:
+                        char_in_str = None
+                        continue
+
+                    skip_to = char_in_str_len
+                    if (qp := char_in_str.find(q, char_in_str_pos)) >= 0 and qp < skip_to:
+                        skip_to = qp
+                    if (sp := char_in_str.find('\\', char_in_str_pos)) >= 0 and sp < skip_to:
+                        skip_to = sp
+
+                    if skip_to != char_in_str_pos:
+                        ofs += skip_to - char_in_str_pos
+                        if (np := char_in_str.rfind('\n', char_in_str_pos, skip_to)) >= 0:
+                            line += char_in_str.count('\n', char_in_str_pos, skip_to)
+                            col = np - char_in_str_pos
+                        else:
+                            col += skip_to - char_in_str_pos
+                        buf.write(char_in_str[char_in_str_pos:skip_to])
+
+                        if skip_to >= char_in_str_len:
+                            char_in_str = None
+                            continue
+                        char_in_str_pos = skip_to
+
                     c = char_in_str[char_in_str_pos]
                     char_in_str_pos += 1
-                else:
-                    char_in_str = None
 
-            if c is None:
-                try:
-                    c = (yield None)
-                except GeneratorExit:
-                    restore_state()
-                    self._raise('Unexpected end of input')
+                if c is None:
+                    try:
+                        c = (yield None)
+                    except GeneratorExit:
+                        restore_state()
+                        self._raise('Unexpected end of input')
+
+                    if len(c) > 1:
+                        char_in_str = c
+                        char_in_str_len = len(char_in_str)
+                        char_in_str_pos = 0
+                        c = None
+                        continue
 
-                if len(c) > 1:
-                    char_in_str = c
-                    char_in_str_len = len(char_in_str)
-                    char_in_str_pos = 1
-                    c = c[0]
+                if c is None:
+                    raise JsonStreamError
 
-            if c and len(c) != 1:
-                raise JsonStreamError(c)
+                if c and len(c) != 1:
+                    raise JsonStreamError(c)
+
+                break
 
             ofs += 1
 

omlish/lang/imports/capture.py

@@ -390,6 +390,9 @@ class _AbstractBuiltinsImportCaptureHook(_ImportCaptureHook):
         )
 
 
+#
+
+
 class _UnsafeGlobalBuiltinsImportCaptureHook(_AbstractBuiltinsImportCaptureHook):
     @contextlib.contextmanager
     def _hook_context(

{omlish-0.0.0.dev445.dist-info → omlish-0.0.0.dev446.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev445
+Version: 0.0.0.dev446
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev445.dist-info → omlish-0.0.0.dev446.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.omlish-manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=l_CYKLoqEfq6eAr9gqXrD5Kc9h73YjDaqtcp7Jsos90,3613
+omlish/__about__.py,sha256=8r90y0nduA_a3W7mllnllThp_MJ9YW_OIny1z_qo-PE,3613
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ZNIMl1kwg3qdei4DiUrJPQe5M81S1e76N-GuNSwLBAE,8683
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -267,7 +267,7 @@ omlish/formats/json/backends/ujson.py,sha256=U3iOlAURfiCdXbiNlXfIjDdtJDbDaLZsSuZ
 omlish/formats/json/stream/__init__.py,sha256=LoYSkdUX3lkQ4g9JB_F6YOeexlOEporKW8bW8tv3YXg,859
 omlish/formats/json/stream/building.py,sha256=QAQaTyXuw9vkfhvzWIh_DSlypD1-HgzO855Dgz3_wFM,2517
 omlish/formats/json/stream/errors.py,sha256=c8M8UAYmIZ-vWZLeKD2jMj4EDCJbr9QR8Jq_DyHjujQ,43
-omlish/formats/json/stream/lexing.py,sha256=iSzZj2BqvG_VTM6gVvia_EfXUFSPvRN378oHcAG6YBU,16533
+omlish/formats/json/stream/lexing.py,sha256=FeO7sjCQ6HHBj7VJIwkSxMPUneG1KqDyN-zuACdE_rw,17384
 omlish/formats/json/stream/parsing.py,sha256=bnTaYcCMRh0i_mByQgq4qtVf53zJnmjPvUDwJ7-zL64,7154
 omlish/formats/json/stream/rendering.py,sha256=E5SXMGcbBtgtUYYznTPZFHD4tmV_X7K3MK50V11ESRk,3611
 omlish/formats/json/stream/utils.py,sha256=vX69i90DVCjAAAohpiLgsT3ZinFS_cYUfneTvx-3dxU,4959
@@ -448,7 +448,7 @@ omlish/lang/classes/simple.py,sha256=3AJSs-plVg2flq4SC6I39LxP0nBaB241puv3D5YCP5I
 omlish/lang/classes/virtual.py,sha256=J4y-uiv1RaP2rfFeptXqQ1a4MRek0TMlAFFraO_lzhs,3397
 omlish/lang/imports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lang/imports/_capture.cc,sha256=jAKW9pOV3ER4Vzd-aywmAeOxbv-b_jNdaxAaVdxfueg,2261
-omlish/lang/imports/capture.py,sha256=38jP4ydXgiryz77wZ-52GuPQi2fXUiBYZSzoTuQSLdw,21706
+omlish/lang/imports/capture.py,sha256=0uud2HvBPig3rWqjhLXtSK30vXtKggxFTYDDD9Ab0Gg,21710
 omlish/lang/imports/conditional.py,sha256=R-E47QD95mMonPImWlrde3rnJrFKCCkYz71c94W05sc,1006
 omlish/lang/imports/lazy.py,sha256=Eefs9hkj5surMdwgxX_Q3BOqPcox10v0sKT5rKIQknc,808
 omlish/lang/imports/proxy.py,sha256=wlXJrl1GiXQ-t5cO_aJLqp1mr_Erl4oMk4uySkkK7bg,6516
@@ -820,9 +820,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev445.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev445.dist-info/METADATA,sha256=agRgaRokAzMENgsipDKwsg8FjW0uO6bc6kgfzwkTZ-8,19003
-omlish-0.0.0.dev445.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev445.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev445.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev445.dist-info/RECORD,,
+omlish-0.0.0.dev446.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev446.dist-info/METADATA,sha256=Zhu90LCm4EDjA39rcv3L-_QPuvZB_pBFlTzdQVJ8UuE,19003
+omlish-0.0.0.dev446.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev446.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev446.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev446.dist-info/RECORD,,