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

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev444'
-__revision__ = 'ce3fb695bf149775254b152cc6a5a761e3f5bb90'
+__version__ = '0.0.0.dev446'
+__revision__ = 'eb6b4d97a54d35bfe1b12d84ba99cae32c516e4e'
 
 
 #
@@ -185,6 +185,8 @@ class SetuptoolsBase:
 
 
 class Setuptools(SetuptoolsBase):
+    cexts = True
+
     find_packages = {
         'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],

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.cc

@@ -0,0 +1,101 @@
+// @omlish-cext
+#include <atomic>
+
+#define PY_SSIZE_T_CLEAN
+#define Py_BUILD_CORE 1
+#include "Python.h"
+#include "internal/pycore_frame.h"
+#undef Py_BUILD_CORE
+
+#if PY_VERSION_HEX < 0x030D0000
+#  error "This extension requires CPython 3.13+"
+#endif
+
+//
+
+#define _MODULE_NAME "_capture"
+#define _PACKAGE_NAME "omlish.lang.imports"
+#define _MODULE_FULL_NAME _PACKAGE_NAME "." _MODULE_NAME
+
+//
+
+static PyObject *
+_set_frame_builtins(PyObject *self, PyObject *args)
+{
+    PyObject *frame_obj;
+    PyObject *old_builtins;
+    PyObject *new_builtins;
+
+    if (!PyArg_ParseTuple(
+        args, "OO!O!",
+        &frame_obj,
+        &PyDict_Type, &old_builtins,
+        &PyDict_Type, &new_builtins
+    )) {
+        return NULL;
+    }
+
+    if (!PyFrame_Check(frame_obj)) {
+        PyErr_SetString(PyExc_TypeError, "first argument must be a frame object");
+        return NULL;
+    }
+
+    PyFrameObject *frame = (PyFrameObject *)frame_obj;
+    _PyInterpreterFrame *iframe = frame->f_frame;
+
+    if (!iframe) {
+        PyErr_SetString(PyExc_ValueError, "frame has no underlying interpreter frame");
+        return NULL;
+    }
+
+    std::atomic_ref<PyObject*> builtins_ref(iframe->f_builtins);
+    PyObject* expected = old_builtins;
+    bool success = builtins_ref.compare_exchange_strong(
+        expected,
+        new_builtins,
+        std::memory_order_acq_rel,
+        std::memory_order_acquire
+    );
+
+    if (success) {
+        Py_RETURN_TRUE;
+    } else {
+        Py_RETURN_FALSE;
+    }
+}
+
+//
+
+PyDoc_STRVAR(capture_doc, _MODULE_NAME);
+
+static PyMethodDef capture_methods[] = {
+    {"_set_frame_builtins", _set_frame_builtins, METH_VARARGS, "_set_frame_builtins"},
+    {NULL, NULL, 0, NULL}
+};
+
+static struct PyModuleDef_Slot capture_slots[] = {
+    {Py_mod_gil, Py_MOD_GIL_NOT_USED},
+    {Py_mod_multiple_interpreters, Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED},
+    {0, NULL}
+};
+
+static struct PyModuleDef capture_module = {
+    .m_base = PyModuleDef_HEAD_INIT,
+    .m_name = _MODULE_NAME,
+    .m_doc = capture_doc,
+    .m_size = 0,
+    .m_methods = capture_methods,
+    .m_slots = capture_slots,
+    .m_traverse = NULL,
+    .m_clear = NULL,
+    .m_free = NULL,
+};
+
+extern "C" {
+
+PyMODINIT_FUNC PyInit__capture(void)
+{
+    return PyModuleDef_Init(&capture_module);
+}
+
+}

omlish/lang/imports/capture.py

@@ -235,10 +235,31 @@ class _ImportCaptureHook:
 
         return module.module_obj
 
-    # @abc.abstractmethod
+    @ta.final
+    @contextlib.contextmanager
     def hook_context(
             self,
             mod_globals: ta.MutableMapping[str, ta.Any],  # noqa
+    ) -> ta.Iterator[None]:
+        if self._MOD_SELF_ATTR in mod_globals:
+            raise ImportCaptureErrors.HookError
+
+        mod_globals[self._MOD_SELF_ATTR] = self
+
+        try:
+            with self._hook_context(mod_globals):
+                yield
+
+        finally:
+            if mod_globals[self._MOD_SELF_ATTR] is not self:
+                raise ImportCaptureErrors.HookError
+
+            del mod_globals[self._MOD_SELF_ATTR]
+
+    # @abc.abstractmethod
+    def _hook_context(
+            self,
+            mod_globals: ta.MutableMapping[str, ta.Any],  # noqa
     ) -> ta.ContextManager[None]:
         raise NotImplementedError
 
@@ -333,7 +354,10 @@ class _ImportCaptureHook:
         )
 
 
-class _AbstractBuiltinImportCaptureHook(_ImportCaptureHook):
+#
+
+
+class _AbstractBuiltinsImportCaptureHook(_ImportCaptureHook):
     def _new_import(
             self,
             old_import,
@@ -366,38 +390,31 @@ class _AbstractBuiltinImportCaptureHook(_ImportCaptureHook):
         )
 
 
-class _UnsafeGlobalBuiltinImportCaptureHook(_AbstractBuiltinImportCaptureHook):
+#
+
+
+class _UnsafeGlobalBuiltinsImportCaptureHook(_AbstractBuiltinsImportCaptureHook):
     @contextlib.contextmanager
-    def hook_context(
+    def _hook_context(
             self,
             mod_globals: ta.MutableMapping[str, ta.Any],  # noqa
     ) -> ta.Iterator[None]:
-        if self._MOD_SELF_ATTR in mod_globals:
-            raise ImportCaptureErrors.HookError
-
-        #
-
         old_import = builtins.__import__
         new_import = functools.partial(self._new_import, old_import)
 
-        mod_globals[self._MOD_SELF_ATTR] = self
         builtins.__import__ = new_import
 
         try:
             yield
 
         finally:
-            if not (
-                    mod_globals[self._MOD_SELF_ATTR] is self and
-                    builtins.__import__ is new_import
-            ):
+            if builtins.__import__ is not new_import:
                 raise ImportCaptureErrors.HookError
 
-            del mod_globals[self._MOD_SELF_ATTR]
             builtins.__import__ = old_import
 
 
-class _SomewhatThreadSafeGlobalBuiltinImportCaptureHook(_AbstractBuiltinImportCaptureHook):
+class _SomewhatThreadSafeGlobalBuiltinsImportCaptureHook(_AbstractBuiltinsImportCaptureHook):
     class _AlreadyPatchedError(Exception):
         pass
 
@@ -411,23 +428,23 @@ class _SomewhatThreadSafeGlobalBuiltinImportCaptureHook(_AbstractBuiltinImportCa
             self.__uninstalled = False
 
         @classmethod
-        def _add_hook(cls, mod_globals, new_import) -> '_SomewhatThreadSafeGlobalBuiltinImportCaptureHook._Patch':
+        def _add_hook(cls, mod_globals, new_import) -> '_SomewhatThreadSafeGlobalBuiltinsImportCaptureHook._Patch':
             gi = id(mod_globals)
             for _ in range(1_000):
                 try:
                     with cls.__lock:
                         x: ta.Any = builtins.__import__
-                        p: _SomewhatThreadSafeGlobalBuiltinImportCaptureHook._Patch
+                        p: _SomewhatThreadSafeGlobalBuiltinsImportCaptureHook._Patch
                         if x.__class__ is cls:
                             p = x
                             if p.__uninstalled:  # noqa
-                                raise _SomewhatThreadSafeGlobalBuiltinImportCaptureHook._AlreadyPatchedError  # noqa
+                                raise _SomewhatThreadSafeGlobalBuiltinsImportCaptureHook._AlreadyPatchedError  # noqa
                         else:
                             p = cls(x)
                             builtins.__import__ = p
                         p.__hooks[gi] = (mod_globals, new_import)
                         return p
-                except _SomewhatThreadSafeGlobalBuiltinImportCaptureHook._AlreadyPatchedError:
+                except _SomewhatThreadSafeGlobalBuiltinsImportCaptureHook._AlreadyPatchedError:
                     pass
             raise ImportCaptureErrors.HookError('Failed to install builtins hook')
 
@@ -480,17 +497,11 @@ class _SomewhatThreadSafeGlobalBuiltinImportCaptureHook(_AbstractBuiltinImportCa
             )
 
     @contextlib.contextmanager
-    def hook_context(
+    def _hook_context(
             self,
             mod_globals: ta.MutableMapping[str, ta.Any],  # noqa
     ) -> ta.Iterator[None]:
-        if self._MOD_SELF_ATTR in mod_globals:
-            raise ImportCaptureErrors.HookError
-
-        #
-
-        mod_globals[self._MOD_SELF_ATTR] = self
-        patch = _SomewhatThreadSafeGlobalBuiltinImportCaptureHook._Patch._add_hook(mod_globals, self._new_import)  # noqa
+        patch = _SomewhatThreadSafeGlobalBuiltinsImportCaptureHook._Patch._add_hook(mod_globals, self._new_import)  # noqa
 
         try:
             yield
@@ -498,12 +509,18 @@ class _SomewhatThreadSafeGlobalBuiltinImportCaptureHook(_AbstractBuiltinImportCa
         finally:
             patch._remove_hook(mod_globals)  # noqa
 
-            if mod_globals[self._MOD_SELF_ATTR] is not self:
-                raise ImportCaptureErrors.HookError
-            del mod_globals[self._MOD_SELF_ATTR]
+
+#
+
+
+_capture: ta.Any = None
+try:
+    from . import _capture  # type: ignore
+except ImportError:
+    pass
 
 
-class _FrameBuiltinImportCaptureHook(_AbstractBuiltinImportCaptureHook):
+class _FrameBuiltinsImportCaptureHook(_AbstractBuiltinsImportCaptureHook):
     def __init__(
             self,
             *,
@@ -519,41 +536,35 @@ class _FrameBuiltinImportCaptureHook(_AbstractBuiltinImportCaptureHook):
             cls,
             frame: types.FrameType,
             new_builtins: dict[str, ta.Any],
-    ) -> None:
-        # FIXME: cext...
-        frame.f_builtins = new_builtins  # type: ignore[misc]  # noqa
+    ) -> bool:
+        return _capture._set_frame_builtins(frame, frame.f_builtins, new_builtins)  # noqa
 
     @contextlib.contextmanager
-    def hook_context(
+    def _hook_context(
             self,
             mod_globals: ta.MutableMapping[str, ta.Any],  # noqa
     ) -> ta.Iterator[None]:
-        if self._MOD_SELF_ATTR in mod_globals:
-            raise ImportCaptureErrors.HookError
-
-        #
-
         old_builtins = self._frame.f_builtins
         old_import = old_builtins['__import__']
         new_import = functools.partial(self._new_import, old_import)
 
-        mod_globals[self._MOD_SELF_ATTR] = self
         new_builtins = dict(old_builtins)
         new_builtins['__import__'] = new_import
-        self._set_frame_builtins(self._frame, new_builtins)
+        if not self._set_frame_builtins(self._frame, new_builtins):
+            raise ImportCaptureErrors.HookError
 
         try:
             yield
 
         finally:
-            if not (
-                    mod_globals[self._MOD_SELF_ATTR] is self and
-                    self._frame.f_builtins is new_builtins
-            ):
+            if self._frame.f_builtins is not new_builtins:
                 raise ImportCaptureErrors.HookError
 
-            del mod_globals[self._MOD_SELF_ATTR]
-            self._set_frame_builtins(self._frame, old_builtins)
+            if not self._set_frame_builtins(self._frame, old_builtins):
+                raise ImportCaptureErrors.HookError
+
+
+#
 
 
 def _new_import_capture_hook(
@@ -566,14 +577,10 @@ def _new_import_capture_hook(
     if frame is None or frame.f_globals is not mod_globals:
         raise ImportCaptureError("Can't find importing frame")
 
-    # return _FrameBuiltinImportCaptureHook(
-    #     _frame=frame,
-    #     **kwargs,
-    # )
-
-    # return _UnsafeGlobalBuiltinImportCaptureHook(**kwargs)
+    if _capture is not None:
+        return _FrameBuiltinsImportCaptureHook(_frame=frame, **kwargs)
 
-    return _SomewhatThreadSafeGlobalBuiltinImportCaptureHook(**kwargs)
+    return _SomewhatThreadSafeGlobalBuiltinsImportCaptureHook(**kwargs)
 
 
 ##

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

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

{omlish-0.0.0.dev444.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=D7D4UxsfklmK-zdp6Wwtzw06_4DWmvYn98lqDSM6AsY,3595
+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
@@ -447,7 +447,8 @@ omlish/lang/classes/restrict.py,sha256=xHLIK20MQ_jJPQ7JVzMNhyN4Xc4eLBgrcxqDnTbeK
 omlish/lang/classes/simple.py,sha256=3AJSs-plVg2flq4SC6I39LxP0nBaB241puv3D5YCP5I,2973
 omlish/lang/classes/virtual.py,sha256=J4y-uiv1RaP2rfFeptXqQ1a4MRek0TMlAFFraO_lzhs,3397
 omlish/lang/imports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/lang/imports/capture.py,sha256=Q6UUKKolgovpo3IabWV8fTRmuNffJj5jwsT-cyJzVQM,21859
+omlish/lang/imports/_capture.cc,sha256=jAKW9pOV3ER4Vzd-aywmAeOxbv-b_jNdaxAaVdxfueg,2261
+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
@@ -819,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.dev444.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev444.dist-info/METADATA,sha256=2yqL9SPGq9kDHq7xgB2IHEl5pXuPVFwl_8_Fu8i_zJ4,19003
-omlish-0.0.0.dev444.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev444.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev444.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev444.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,,